Angle conservation.

skiko/build.gradle.kts

@@ -267,8 +267,6 @@ tasks.withType(CppCompile::class.java).configureEach {
                 listOf(
                     "-I$jdkHome/include/win32",
                     "-I$includeDir",
-                    "-I$skiaDir/third_party/externals/angle2/include",
-                    "-I$skiaDir/src/gpu",
                     "-DSK_BUILD_FOR_WIN",
                     "-D_CRT_SECURE_NO_WARNINGS",
                     "-D_HAS_EXCEPTIONS=0",
@@ -276,9 +274,12 @@ tasks.withType(CppCompile::class.java).configureEach {
                     "-DNOMINMAX",
                     "-DSK_GAMMA_APPLY_TO_A8",
                     "-DSK_DIRECT3D",
-                    "-DSK_ANGLE",
                     "/utf-8",
                     "/GR-", // no-RTTI.
+                    // LATER. Ange rendering arguments:
+                    // "-I$skiaDir/third_party/externals/angle2/include",
+                    // "-I$skiaDir/src/gpu",
+                    // "-DSK_ANGLE",
                     *buildType.msvcFlags
                     )
             )

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/PlatformOperations.kt

@@ -5,7 +5,6 @@ import org.jetbrains.skiko.redrawer.MacOsOpenGLRedrawer
 import org.jetbrains.skiko.redrawer.SoftwareRedrawer
 import org.jetbrains.skiko.redrawer.Redrawer
 import org.jetbrains.skiko.redrawer.WindowsOpenGLRedrawer
-import org.jetbrains.skiko.redrawer.AngleRedrawer
 import org.jetbrains.skiko.redrawer.Direct3DRedrawer
 import org.jetbrains.skiko.redrawer.MetalRedrawer
 import java.awt.Component
@@ -69,7 +68,6 @@ internal val platformOperations: PlatformOperations by lazy {
                 ) = when(renderApi) {
                     GraphicsApi.SOFTWARE -> SoftwareRedrawer(layer)
                     GraphicsApi.DIRECT3D -> Direct3DRedrawer(layer, properties)
-                    GraphicsApi.ANGLE -> AngleRedrawer(layer, properties)
                     else -> WindowsOpenGLRedrawer(layer, properties)
                 }
             }

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkikoProperties.kt

@@ -33,10 +33,6 @@ internal object SkikoProperties {
                 return if (hostOs == OS.Windows) GraphicsApi.DIRECT3D
                     else throw Exception("$hostOs does not support DirectX rendering API.")
             }
-            "ANGLE" -> {
-                return if (hostOs == OS.Windows) GraphicsApi.ANGLE
-                    else throw Exception("$hostOs does not support DirectX rendering API.")
-            }
             "METAL" -> {
                 return if (hostOs == OS.MacOS) GraphicsApi.METAL
                     else throw Exception("$hostOs does not support Metal rendering API.")
@@ -49,7 +45,7 @@ internal object SkikoProperties {
         when(hostOs) {
             OS.MacOS -> return GraphicsApi.METAL
             OS.Linux -> return GraphicsApi.OPENGL
-            OS.Windows -> return GraphicsApi.ANGLE
+            OS.Windows -> return GraphicsApi.DIRECT3D
         }
     }
 
@@ -60,7 +56,7 @@ internal object SkikoProperties {
         when (hostOs) {
             OS.Linux -> renderApiList = mutableListOf(GraphicsApi.OPENGL, GraphicsApi.SOFTWARE)
             OS.MacOS -> renderApiList = mutableListOf(GraphicsApi.METAL, GraphicsApi.OPENGL, GraphicsApi.SOFTWARE)
-            OS.Windows -> renderApiList = mutableListOf(GraphicsApi.ANGLE, GraphicsApi.DIRECT3D, GraphicsApi.OPENGL, GraphicsApi.SOFTWARE)
+            OS.Windows -> renderApiList = mutableListOf(GraphicsApi.DIRECT3D, GraphicsApi.OPENGL, GraphicsApi.SOFTWARE)
         }
         renderApiList.remove(head)
 

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/ContextHandler.kt

@@ -18,7 +18,6 @@ internal fun createContextHandler(layer: SkiaLayer, renderApi: GraphicsApi): Con
         GraphicsApi.OPENGL -> OpenGLContextHandler(layer)
         GraphicsApi.DIRECT3D -> Direct3DContextHandler(layer)
         GraphicsApi.METAL -> MetalContextHandler(layer)
-        GraphicsApi.ANGLE -> AngleContextHandler(layer)
         else -> TODO("Unsupported yet.")
     }
 }