Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
083431eb
Commit
083431eb
authored
Apr 29, 2021
by
Roman Sedaikin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added OS/JRE info in debug output.
parent
fb8b5aea
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
7 deletions
+44
-7
OsArch.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/OsArch.kt
+13
-1
Direct3DContextHandler.kt
...lin/org/jetbrains/skiko/context/Direct3DContextHandler.kt
+8
-2
MetalContextHandler.kt
...kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
+8
-2
OpenGLContextHandler.kt
...otlin/org/jetbrains/skiko/context/OpenGLContextHandler.kt
+8
-2
SoftwareContextHandler.kt
...lin/org/jetbrains/skiko/context/SoftwareContextHandler.kt
+7
-0
No files found.
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/OsArch.kt
View file @
083431eb
...
@@ -37,3 +37,15 @@ val hostArch by lazy {
...
@@ -37,3 +37,15 @@ val hostArch by lazy {
val
hostId
by
lazy
{
val
hostId
by
lazy
{
"${hostOs.id}-${hostArch.id}"
"${hostOs.id}-${hostArch.id}"
}
}
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
")}"
}
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/Direct3DContextHandler.kt
View file @
083431eb
...
@@ -6,6 +6,9 @@ import org.jetbrains.skija.SurfaceColorFormat
...
@@ -6,6 +6,9 @@ import org.jetbrains.skija.SurfaceColorFormat
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skiko.SkiaLayer
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
org.jetbrains.skiko.redrawer.Direct3DRedrawer
import
java.lang.ref.Reference
import
java.lang.ref.Reference
...
@@ -109,8 +112,11 @@ internal class Direct3DContextHandler(layer: SkiaLayer) : ContextHandler(layer)
...
@@ -109,8 +112,11 @@ internal class Direct3DContextHandler(layer: SkiaLayer) : ContextHandler(layer)
}
}
override
fun
hardwareInfo
():
String
{
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"
+
"Video card: ${directXRedrawer.getAdapterName(device)}\n"
+
"Total
memory
: ${directXRedrawer.getAdapterMemorySize(device) / 1024 / 1024} MB\n"
"Total
VRAM
: ${directXRedrawer.getAdapterMemorySize(device) / 1024 / 1024} MB\n"
}
}
}
}
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
View file @
083431eb
...
@@ -6,6 +6,9 @@ import org.jetbrains.skija.SurfaceColorFormat
...
@@ -6,6 +6,9 @@ import org.jetbrains.skija.SurfaceColorFormat
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skiko.SkiaLayer
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
import
org.jetbrains.skiko.redrawer.MetalRedrawer
internal
class
MetalContextHandler
(
layer
:
SkiaLayer
)
:
ContextHandler
(
layer
)
{
internal
class
MetalContextHandler
(
layer
:
SkiaLayer
)
:
ContextHandler
(
layer
)
{
...
@@ -58,8 +61,11 @@ internal class MetalContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
...
@@ -58,8 +61,11 @@ internal class MetalContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
}
}
override
fun
hardwareInfo
():
String
{
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"
+
"Video card: ${metalRedrawer.getAdapterName()}\n"
+
"Total
memory
: ${metalRedrawer.getAdapterMemorySize() / 1024 / 1024} MB\n"
"Total
VRAM
: ${metalRedrawer.getAdapterMemorySize() / 1024 / 1024} MB\n"
}
}
}
}
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/OpenGLContextHandler.kt
View file @
083431eb
...
@@ -8,6 +8,9 @@ import org.jetbrains.skija.SurfaceOrigin
...
@@ -8,6 +8,9 @@ import org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skiko.OpenGLApi
import
org.jetbrains.skiko.OpenGLApi
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.makeGLContext
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
import
org.jetbrains.skiko.makeGLRenderTarget
internal
class
OpenGLContextHandler
(
layer
:
SkiaLayer
)
:
ContextHandler
(
layer
)
{
internal
class
OpenGLContextHandler
(
layer
:
SkiaLayer
)
:
ContextHandler
(
layer
)
{
...
@@ -68,9 +71,12 @@ internal class OpenGLContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
...
@@ -68,9 +71,12 @@ internal class OpenGLContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
override
fun
hardwareInfo
():
String
{
override
fun
hardwareInfo
():
String
{
val
gl
=
OpenGLApi
.
instance
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"
+
"Vendor: ${gl.glGetString(gl.GL_VENDOR)}\n"
+
"Model: ${gl.glGetString(gl.GL_RENDERER)}\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"
}
}
}
}
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/SoftwareContextHandler.kt
View file @
083431eb
...
@@ -76,4 +76,11 @@ internal class SoftwareContextHandler(layer: SkiaLayer) : ContextHandler(layer)
...
@@ -76,4 +76,11 @@ internal class SoftwareContextHandler(layer: SkiaLayer) : ContextHandler(layer)
override
fun
flush
()
{
override
fun
flush
()
{
// Raster does not need to flush canvas
// 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"
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment