Some fixes for Angle

Author: MAJigsaw77

lib/draft-api/src/openfl/display3D/Context3D.hx

@@ -2377,9 +2377,12 @@ import lime.math.Vector2;
 					__bindGLTextureCubeMap(texture.__getTexture());
 				}
 
-				#if (desktop && !html5)
-				// TODO: Cache?
-				gl.enable(gl.TEXTURE_2D);
+				#if lime
+				if (__context.type == OPENGL)
+				{
+					// TODO: Cache?
+					gl.enable(gl.TEXTURE_2D);
+				}
 				#end
 
 				__contextState.textures[i] = texture;
@@ -2422,9 +2425,12 @@ import lime.math.Vector2;
 					texture.__alphaTexture.__setSamplerState(samplerState);
 					gl.uniform1i(__state.program.__agalAlphaSamplerEnabled[sampler].location, 1);
 
-					#if (desktop && !html5)
-					// TODO: Cache?
-					gl.enable(gl.TEXTURE_2D);
+					#if lime
+					if (__context.type == OPENGL)
+					{
+						// TODO: Cache?
+						gl.enable(gl.TEXTURE_2D);
+					}
 					#end
 				}
 				else

src/openfl/display/OpenGLRenderer.hx

@@ -73,6 +73,7 @@ class OpenGLRenderer extends DisplayObjectRenderer
 	@:noCompletion private static var __staticDefaultDisplayShader:DisplayObjectShader;
 	@:noCompletion private static var __staticDefaultGraphicsShader:GraphicsShader;
 	@:noCompletion private static var __staticMaskShader:Context3DMaskShader;
+	@:noCompletion private static var __sRGBWriteControlSupported:Null<Bool>;
 	@:noCompletion private static var __complexBlendsSupported:Null<Bool>;
 	@:noCompletion private static var __coherentBlendsSupported:Null<Bool>;
 
@@ -142,6 +143,16 @@ class OpenGLRenderer extends DisplayObjectRenderer
 		}
 		#end
 
+		if (__sRGBWriteControlSupported == null)
+		{
+			__sRGBWriteControlSupported = gl.getSupportedExtensions().contains("EXT_sRGB_write_control");
+		}
+
+		if (__sRGBWriteControlSupported)
+		{
+			gl.disable(0x8DB9); // GL_FRAMEBUFFER_SRGB
+		}
+
 		if (__complexBlendsSupported == null)
 		{
 			#if desktop

src/openfl/display/Shader.hx

@@ -625,8 +625,8 @@ class Shader
 			extensions += "#extension " + ext.name + " : " + ext.behavior + "\n";
 		}
 
-		var complexBlendsSupported = OpenGLRenderer.__complexBlendsSupported && isFragment
-			#if desktop && (!StringTools.startsWith(__glVersion, "1") || __glVersion == "150") #end;
+		var complexBlendsSupported = OpenGLRenderer.__complexBlendsSupported && isFragment #if desktop
+		&& (!StringTools.startsWith(__glVersion, "1") || __glVersion == "150") #end;
 
 		if (complexBlendsSupported)
 		{

src/openfl/display/Stage.hx

@@ -1239,6 +1239,8 @@ class Stage extends DisplayObjectContainer #if lime implements IModule #end
 
 		if (__renderer != null)
 		{
+			__renderer.__clear();
+
 			__renderer.__allowSmoothing = (quality != LOW);
 			__renderer.__pixelRatio = #if openfl_disable_hdpi 1 #else window.scale #end;
 			__renderer.__worldTransform = __displayMatrix;

src/openfl/display3D/Context3D.hx

@@ -2438,9 +2438,12 @@ import lime.math.Vector2;
 					__bindGLTextureCubeMap(texture.__getTexture());
 				}
 
-				#if (desktop && !html5)
-				// TODO: Cache?
-				gl.enable(gl.TEXTURE_2D);
+				#if lime
+				if (__context.type == OPENGL)
+				{
+					// TODO: Cache?
+					gl.enable(gl.TEXTURE_2D);
+				}
 				#end
 
 				__contextState.textures[i] = texture;
@@ -2472,9 +2475,12 @@ import lime.math.Vector2;
 					texture.__alphaTexture.__setSamplerState(samplerState);
 					gl.uniform1i(__state.program.__agalAlphaSamplerEnabled[sampler].location, 1);
 
-					#if (desktop && !html5)
-					// TODO: Cache?
-					gl.enable(gl.TEXTURE_2D);
+					#if lime
+					if (__context.type == OPENGL)
+					{
+						// TODO: Cache?
+						gl.enable(gl.TEXTURE_2D);
+					}
 					#end
 				}
 				else

src/openfl/display3D/textures/TextureBase.hx

@@ -84,13 +84,7 @@ class TextureBase extends EventDispatcher
 			{
 				__supportsBGRA = true;
 				__textureFormat = bgraExtension.BGRA_EXT;
-
-				#if (lime && !ios && !tvos)
-				if (context.__context.type == OPENGLES)
-				{
-					__textureInternalFormat = bgraExtension.BGRA_EXT;
-				}
-				#end
+				__textureInternalFormat = bgraExtension.BGRA_EXT;
 			}
 			else
 			{
@@ -369,8 +363,13 @@ class TextureBase extends EventDispatcher
 			gl.texParameteri(__textureTarget, gl.TEXTURE_MAG_FILTER, magFilter);
 			gl.texParameteri(__textureTarget, gl.TEXTURE_WRAP_S, wrapModeS);
 			gl.texParameteri(__textureTarget, gl.TEXTURE_WRAP_T, wrapModeT);
-			gl.texParameterf(__textureTarget, 34049, state.lodBias); // GL_TEXTURE_LOD_BIAS
 
+			#if lime
+			if (__context.__context.type == OPENGL)
+			{
+				gl.texParameterf(__textureTarget, 0x8501, state.lodBias); // GL_TEXTURE_LOD_BIAS
+			}
+			#end
 
 			if (__samplerState == null) __samplerState = state.clone();
 			__samplerState.copyFrom(state);

src/openfl/utils/_internal/ShaderMacro.hx

@@ -441,7 +441,7 @@ class ShaderMacro
 	{
 		// Specify the default glVersion.
 		// We can use compile defines to guess the value that prevents crashes in the majority of cases.
-		return #if (android) "100" #elseif (web) "100" #elseif (mac) "120" #elseif (desktop) "150" #else "100" #end;
+		return "100";
 	}
 
 	/**