Commit 09742091 authored by Roman Sedaikin's avatar Roman Sedaikin

Renamed RASTER -> SOFTWARE, D3D -> DIRECT3D

parent 29d1fac3
...@@ -15,7 +15,6 @@ import kotlin.math.cos ...@@ -15,7 +15,6 @@ import kotlin.math.cos
import kotlin.math.sin import kotlin.math.sin
fun main(args: Array<String>) { fun main(args: Array<String>) {
// System.setProperty("skiko.renderApi", "RASTER")
repeat(1) { repeat(1) {
createWindow("window $it") createWindow("window $it")
} }
......
package org.jetbrains.skiko package org.jetbrains.skiko
enum class GraphicsApi { enum class GraphicsApi {
UNKNOWN, RASTER, OPENGL, D3D, VULKAN, METAL UNKNOWN, SOFTWARE, OPENGL, DIRECT3D, VULKAN, METAL
} }
\ No newline at end of file
...@@ -34,7 +34,7 @@ internal val platformOperations: PlatformOperations by lazy { ...@@ -34,7 +34,7 @@ internal val platformOperations: PlatformOperations by lazy {
} }
override fun createRedrawer(layer: HardwareLayer) = when(renderApi) { override fun createRedrawer(layer: HardwareLayer) = when(renderApi) {
GraphicsApi.RASTER -> RasterRedrawer(layer) GraphicsApi.SOFTWARE -> RasterRedrawer(layer)
else -> MacOsRedrawer(layer) else -> MacOsRedrawer(layer)
} }
} }
...@@ -57,7 +57,7 @@ internal val platformOperations: PlatformOperations by lazy { ...@@ -57,7 +57,7 @@ internal val platformOperations: PlatformOperations by lazy {
} }
override fun createRedrawer(layer: HardwareLayer) = when(renderApi) { override fun createRedrawer(layer: HardwareLayer) = when(renderApi) {
GraphicsApi.RASTER -> RasterRedrawer(layer) GraphicsApi.SOFTWARE -> RasterRedrawer(layer)
else -> WindowsRedrawer(layer) else -> WindowsRedrawer(layer)
} }
} }
...@@ -93,7 +93,7 @@ internal val platformOperations: PlatformOperations by lazy { ...@@ -93,7 +93,7 @@ internal val platformOperations: PlatformOperations by lazy {
} }
override fun createRedrawer(layer: HardwareLayer) = when(renderApi) { override fun createRedrawer(layer: HardwareLayer) = when(renderApi) {
GraphicsApi.RASTER -> RasterRedrawer(layer) GraphicsApi.SOFTWARE -> RasterRedrawer(layer)
else -> LinuxRedrawer(layer) else -> LinuxRedrawer(layer)
} }
} }
......
...@@ -4,7 +4,7 @@ import org.jetbrains.skija.* ...@@ -4,7 +4,7 @@ import org.jetbrains.skija.*
import org.jetbrains.skiko.redrawer.Redrawer import org.jetbrains.skiko.redrawer.Redrawer
import org.jetbrains.skiko.redrawer.RasterRedrawer import org.jetbrains.skiko.redrawer.RasterRedrawer
import org.jetbrains.skiko.context.createContextHandler import org.jetbrains.skiko.context.createContextHandler
import org.jetbrains.skiko.context.RasterContextHandler import org.jetbrains.skiko.context.SoftwareContextHandler
import java.awt.Graphics import java.awt.Graphics
import javax.swing.SwingUtilities.isEventDispatchThread import javax.swing.SwingUtilities.isEventDispatchThread
...@@ -136,7 +136,7 @@ open class SkiaLayer : HardwareLayer() { ...@@ -136,7 +136,7 @@ open class SkiaLayer : HardwareLayer() {
private fun fallbackToRaster() { private fun fallbackToRaster() {
println("Falling back to software rendering...") println("Falling back to software rendering...")
redrawer?.dispose() redrawer?.dispose()
skijaState = RasterContextHandler(this) skijaState = SoftwareContextHandler(this)
redrawer = RasterRedrawer(this) redrawer = RasterRedrawer(this)
needRedraw() needRedraw()
} }
......
...@@ -22,7 +22,7 @@ internal val renderApi: GraphicsApi by lazy { ...@@ -22,7 +22,7 @@ internal val renderApi: GraphicsApi by lazy {
private fun parseRenderApi(text: String?): GraphicsApi { private fun parseRenderApi(text: String?): GraphicsApi {
when(text) { when(text) {
"RASTER" -> return GraphicsApi.RASTER "SOFTWARE" -> return GraphicsApi.SOFTWARE
"OPENGL" -> return GraphicsApi.OPENGL "OPENGL" -> return GraphicsApi.OPENGL
else -> return GraphicsApi.OPENGL else -> return GraphicsApi.OPENGL
} }
...@@ -30,7 +30,7 @@ private fun parseRenderApi(text: String?): GraphicsApi { ...@@ -30,7 +30,7 @@ private fun parseRenderApi(text: String?): GraphicsApi {
internal fun createContextHandler(layer: HardwareLayer): ContextHandler { internal fun createContextHandler(layer: HardwareLayer): ContextHandler {
return when (renderApi) { return when (renderApi) {
GraphicsApi.RASTER -> RasterContextHandler(layer) GraphicsApi.SOFTWARE -> SoftwareContextHandler(layer)
GraphicsApi.OPENGL -> OpenGLContextHandler(layer) GraphicsApi.OPENGL -> OpenGLContextHandler(layer)
else -> TODO("Unsupported yet") else -> TODO("Unsupported yet")
} }
......
...@@ -18,7 +18,7 @@ import org.jetbrains.skiko.HardwareLayer ...@@ -18,7 +18,7 @@ import org.jetbrains.skiko.HardwareLayer
import org.jetbrains.skija.ImageInfo import org.jetbrains.skija.ImageInfo
import org.jetbrains.skija.Picture import org.jetbrains.skija.Picture
internal class RasterContextHandler(layer: HardwareLayer) : ContextHandler(layer) { internal class SoftwareContextHandler(layer: HardwareLayer) : ContextHandler(layer) {
override val bleachConstant = -1 // it looks like java.awt.Canvas doesn't support transparency override val bleachConstant = -1 // it looks like java.awt.Canvas doesn't support transparency
val colorModel = ComponentColorModel( val colorModel = ComponentColorModel(
......
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