Commit 083431eb authored by Roman Sedaikin's avatar Roman Sedaikin

Added OS/JRE info in debug output.

parent fb8b5aea
......@@ -36,4 +36,16 @@ val hostArch by lazy {
val hostId by lazy {
"${hostOs.id}-${hostArch.id}"
}
\ No newline at end of file
}
internal val hostFullName by lazy {
"${System.getProperty("os.name")}, ${System.getProperty("os.version")}, ${hostArch.toString().toLowerCase()}"
}
internal val javaVendor by lazy {
"${System.getProperty("java.vendor")} ${System.getProperty("java.version")}"
}
internal val javaLocation by lazy {
"${System.getProperty("java.home")}"
}
......@@ -6,6 +6,9 @@ import org.jetbrains.skija.SurfaceColorFormat
import org.jetbrains.skija.SurfaceOrigin
import org.jetbrains.skija.impl.Native
import org.jetbrains.skiko.SkiaLayer
import org.jetbrains.skiko.hostFullName
import org.jetbrains.skiko.javaLocation
import org.jetbrains.skiko.javaVendor
import org.jetbrains.skiko.redrawer.Direct3DRedrawer
import java.lang.ref.Reference
......@@ -109,8 +112,11 @@ internal class Direct3DContextHandler(layer: SkiaLayer) : ContextHandler(layer)
}
override fun hardwareInfo(): String {
return "DIRECT3D (dx12) hardware info:\n" +
return "DIRECT3D (dx12) rendering info:\n" +
"OS: $hostFullName\n" +
"Java: $javaVendor\n" +
"Java location: $javaLocation\n" +
"Video card: ${directXRedrawer.getAdapterName(device)}\n" +
"Total memory: ${directXRedrawer.getAdapterMemorySize(device) / 1024 / 1024} MB\n"
"Total VRAM: ${directXRedrawer.getAdapterMemorySize(device) / 1024 / 1024} MB\n"
}
}
......@@ -6,6 +6,9 @@ import org.jetbrains.skija.SurfaceColorFormat
import org.jetbrains.skija.SurfaceOrigin
import org.jetbrains.skija.impl.Native
import org.jetbrains.skiko.SkiaLayer
import org.jetbrains.skiko.hostFullName
import org.jetbrains.skiko.javaLocation
import org.jetbrains.skiko.javaVendor
import org.jetbrains.skiko.redrawer.MetalRedrawer
internal class MetalContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
......@@ -58,8 +61,11 @@ internal class MetalContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
}
override fun hardwareInfo(): String {
return "METAL hardware info:\n" +
return "METAL rendering info:\n" +
"OS: $hostFullName\n" +
"Java: $javaVendor\n" +
"Java location: $javaLocation\n" +
"Video card: ${metalRedrawer.getAdapterName()}\n" +
"Total memory: ${metalRedrawer.getAdapterMemorySize() / 1024 / 1024} MB\n"
"Total VRAM: ${metalRedrawer.getAdapterMemorySize() / 1024 / 1024} MB\n"
}
}
......@@ -8,6 +8,9 @@ import org.jetbrains.skija.SurfaceOrigin
import org.jetbrains.skiko.OpenGLApi
import org.jetbrains.skiko.SkiaLayer
import org.jetbrains.skiko.makeGLContext
import org.jetbrains.skiko.hostFullName
import org.jetbrains.skiko.javaLocation
import org.jetbrains.skiko.javaVendor
import org.jetbrains.skiko.makeGLRenderTarget
internal class OpenGLContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
......@@ -68,9 +71,12 @@ internal class OpenGLContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
override fun hardwareInfo(): String {
val gl = OpenGLApi.instance
return "OPENGL hardware info:\n" +
return "OPENGL rendering info:\n" +
"OS: $hostFullName\n" +
"Java: $javaVendor\n" +
"Java location: $javaLocation\n" +
"Vendor: ${gl.glGetString(gl.GL_VENDOR)}\n" +
"Model: ${gl.glGetString(gl.GL_RENDERER)}\n" +
"Total memory: ${gl.glGetIntegerv(gl.GL_TOTAL_MEMORY) / 1024} MB\n"
"Total VRAM: ${gl.glGetIntegerv(gl.GL_TOTAL_MEMORY) / 1024} MB\n"
}
}
......@@ -76,4 +76,11 @@ internal class SoftwareContextHandler(layer: SkiaLayer) : ContextHandler(layer)
override fun flush() {
// Raster does not need to flush canvas
}
override fun hardwareInfo(): String {
return "SOFTWARE rendering info:\n" +
"OS: $hostFullName\n" +
"Java: $javaVendor\n" +
"Java location: $javaLocation\n"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment