AMIGAOS: Improve shader compatibility

OGLES2 doesn't support uniform booleans so we use macros to make it use
integers in this case. For other platforms, this change should be a
noop.
OGLES2 doesn't like float suffix for constants, remove it as well.

backends/graphics3d/opengl/surfacerenderer.cpp

@@ -178,14 +178,23 @@ static const char *boxVertex =
 	"uniform vec2 offsetXY;\n"
 	"uniform vec2 sizeWH;\n"
 	"uniform vec2 texcrop;\n"
+// OGLES2 on AmigaOS doesn't support uniform booleans
+#if defined(AMIGAOS)
+	"uniform mediump int flipY;\n"
+#else
 	"uniform bool flipY;\n"
+#endif
 	"varying vec2 Texcoord;\n"
 	"void main() {\n"
 		"Texcoord = texcoord * texcrop;\n"
 		"vec2 pos = offsetXY + position * sizeWH;\n"
 		"pos.x = pos.x * 2.0 - 1.0;\n"
 		"pos.y = pos.y * 2.0 - 1.0;\n"
+#if defined(AMIGAOS)
+		"if (flipY != 0)\n"
+#else
 		"if (flipY)\n"
+#endif
 			"pos.y *= -1.0;\n"
 		"gl_Position = vec4(pos, 0.0, 1.0);\n"
 	"}\n";

engines/grim/shaders/emi_actor.fragment

@@ -2,7 +2,7 @@ in vec2 Texcoord;
 in vec4 Color;
 
 uniform sampler2D tex;
-uniform bool textured;
+uniform UBOOL textured;
 uniform float alphaRef;
 uniform float meshAlpha;
 
@@ -11,7 +11,7 @@ OUTPUT
 void main()
 {
 	outColor = Color;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		vec4 texColor = texture(tex, Texcoord);
 		outColor.rgba *= texColor.rgba;
 		outColor.a *= meshAlpha;

engines/grim/shaders/emi_actor.vertex

@@ -9,12 +9,12 @@ uniform highp mat4 projMatrix;
 uniform highp mat4 extraMatrix;
 uniform highp mat4 normalMatrix;
 uniform highp vec3 cameraPos;
-uniform bool textured;
+uniform UBOOL textured;
-uniform bool useVertexAlpha;
+uniform UBOOL useVertexAlpha;
 uniform vec4 uniformColor;
 
 struct shadow_info {
-	bool _active;
+	UBOOL _active;
 	vec3 _color;
 	vec3 _light;
 	vec3 _point;
@@ -32,7 +32,7 @@ void main()
 	pos = modelMatrix * pos;
 
 	// See http://en.wikipedia.org/wiki/Line-plane_intersection
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		pos /= pos.w;
 		vec3 l = pos.xyz - shadow._light;
 		float d = dot(shadow._point - shadow._light, shadow._normal) / dot(l, shadow._normal);
@@ -49,15 +49,15 @@ void main()
 
 	gl_Position = projectedPos;
 
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		Color = vec4(shadow._color, 1.0);
 	} else {
 		Color = color;
 	}
-	if (!useVertexAlpha)
+	if (!UBOOL_TEST(useVertexAlpha))
 		Color.a = 1.0;
 	Color *= uniformColor;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		Texcoord = texcoord;
 	} else {
 		Texcoord = vec2(0.0, 0.0);

engines/grim/shaders/emi_actorlights.fragment

@@ -2,7 +2,7 @@ in vec2 Texcoord;
 in vec4 Color;
 
 uniform sampler2D tex;
-uniform bool textured;
+uniform UBOOL textured;
 uniform float alphaRef;
 uniform float meshAlpha;
 
@@ -11,7 +11,7 @@ OUTPUT
 void main()
 {
 	outColor = Color;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		vec4 texColor = texture(tex, Texcoord);
 		outColor.rgba *= texColor.rgba;
 		outColor.a *= meshAlpha;

engines/grim/shaders/emi_actorlights.vertex

@@ -9,10 +9,10 @@ uniform highp mat4 projMatrix;
 uniform highp mat4 extraMatrix;
 uniform highp mat4 normalMatrix;
 uniform highp vec3 cameraPos;
-uniform bool textured;
+uniform UBOOL textured;
-uniform bool useVertexAlpha;
+uniform UBOOL useVertexAlpha;
 uniform vec4 uniformColor;
-uniform bool hasAmbient;
+uniform UBOOL hasAmbient;
 
 const int maxLights = 8;
 uniform vec4 lightsPosition[maxLights];
@@ -21,7 +21,7 @@ uniform vec4 lightsColor[maxLights];
 uniform vec4 lightsParams[maxLights];
 
 struct shadow_info {
-	bool _active;
+	UBOOL _active;
 	vec3 _color;
 	vec3 _light;
 	vec3 _point;
@@ -39,7 +39,7 @@ void main()
 	pos = modelMatrix * pos;
 
 	// See http://en.wikipedia.org/wiki/Line-plane_intersection
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		pos /= pos.w;
 		vec3 l = pos.xyz - shadow._light;
 		float d = dot(shadow._point - shadow._light, shadow._normal) / dot(l, shadow._normal);
@@ -56,15 +56,15 @@ void main()
 
 	gl_Position = projectedPos;
 
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		Color = vec4(shadow._color, 1.0);
 	} else {
 		Color = color;
 	}
-	if (!useVertexAlpha)
+	if (!UBOOL_TEST(useVertexAlpha))
 		Color.a = 1.0;
 	Color *= uniformColor;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		Texcoord = texcoord;
 	} else {
 		Texcoord = vec2(0.0, 0.0);
@@ -109,7 +109,7 @@ void main()
 		light += lightsColor[i].xyz * intensity;
 	}
 
-	if (!hasAmbient)
+	if (!UBOOL_TEST(hasAmbient))
 		light += vec3(0.5, 0.5, 0.5);
 	light /= max(1.0, max(max(light.x, light.y), light.z));
 	Color *= vec4(light, 1.0);

engines/grim/shaders/emi_sprite.fragment

@@ -2,7 +2,7 @@ in vec2 Texcoord;
 in vec4 Color;
 
 uniform sampler2D tex;
-uniform bool textured;
+uniform UBOOL textured;
 uniform float alphaRef;
 uniform float meshAlpha;
 
@@ -11,7 +11,7 @@ OUTPUT
 void main()
 {
 	outColor = Color;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		vec4 texColor = texture(tex, Texcoord);
 		outColor.rgba *= texColor.rgba;
 		outColor.a *= meshAlpha;

engines/grim/shaders/emi_sprite.vertex

@@ -9,12 +9,12 @@ uniform highp mat4 projMatrix;
 uniform highp mat4 extraMatrix;
 uniform highp mat4 normalMatrix;
 uniform highp vec3 cameraPos;
-uniform bool textured;
+uniform UBOOL textured;
-uniform bool useVertexAlpha;
+uniform UBOOL useVertexAlpha;
 uniform vec4 uniformColor;
 
 struct shadow_info {
-	bool _active;
+	UBOOL _active;
 	vec3 _color;
 	vec3 _light;
 	vec3 _point;
@@ -43,15 +43,15 @@ void main()
 
 	gl_Position = projectedPos;
 
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		Color = vec4(shadow._color, 1.0);
 	} else {
 		Color = color;
 	}
-	if (!useVertexAlpha)
+	if (!UBOOL_TEST(useVertexAlpha))
 		Color.a = 1.0;
 	Color *= uniformColor;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		Texcoord = texcoord;
 	} else {
 		Texcoord = vec2(0.0, 0.0);

engines/grim/shaders/grim_actor.fragment

@@ -3,8 +3,8 @@ in vec4 Color;
 
 uniform sampler2D tex;
 uniform sampler2D texZBuf;
-uniform bool textured;
+uniform UBOOL textured;
-uniform bool hasZBuffer;
+uniform UBOOL hasZBuffer;
 uniform vec2 texcropZBuf;
 uniform vec2 screenSize;
 uniform float alphaRef;
@@ -35,10 +35,10 @@ void checkZBuffer()
 
 void main()
 {
-	if (hasZBuffer)
+	if (UBOOL_TEST(hasZBuffer))
 		checkZBuffer();
 	outColor = Color;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		outColor *= texture(tex, Texcoord);
 	}
 

engines/grim/shaders/grim_actor.vertex

@@ -11,12 +11,12 @@ uniform highp mat4 modelMatrix;
 uniform highp mat4 viewMatrix;
 uniform highp mat4 projMatrix;
 uniform highp mat4 extraMatrix;
-uniform bool textured;
+uniform UBOOL textured;
-uniform bool lightsEnabled;
+uniform UBOOL lightsEnabled;
 uniform highp vec2 texScale;
 
 struct shadow_info {
-	bool _active;
+	UBOOL _active;
 	vec3 _color;
 	vec3 _light;
 	vec3 _point;
@@ -33,7 +33,7 @@ void main()
 	vec4 pos = modelMatrix * extraMatrix * vec4(position, 1.0);
 
 	// See http://en.wikipedia.org/wiki/Line-plane_intersection
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		pos /= pos.w;
 		vec3 l = pos.xyz - shadow._light;
 		float d = dot(shadow._point - shadow._light, shadow._normal) / dot(l, shadow._normal);
@@ -44,13 +44,13 @@ void main()
 	vec4 positionView = viewMatrix * pos;
 	gl_Position = projMatrix * positionView;
 
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		Color = vec4(shadow._color, 1.0);
 	} else {
 		Color = color;
 	}
 
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		Texcoord = vec2(0.0, 1.0) + (texcoord / texScale);
 	} else {
 		Texcoord = vec2(0.0, 0.0);

engines/grim/shaders/grim_actorlights.fragment

@@ -3,8 +3,8 @@ in vec4 Color;
 
 uniform sampler2D tex;
 uniform sampler2D texZBuf;
-uniform bool textured;
+uniform UBOOL textured;
-uniform bool hasZBuffer;
+uniform UBOOL hasZBuffer;
 uniform vec2 texcropZBuf;
 uniform vec2 screenSize;
 uniform float alphaRef;
@@ -35,10 +35,10 @@ void checkZBuffer()
 
 void main()
 {
-	if (hasZBuffer)
+	if (UBOOL_TEST(hasZBuffer))
 		checkZBuffer();
 	outColor = Color;
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		outColor *= texture(tex, Texcoord);
 	}
 

engines/grim/shaders/grim_actorlights.vertex

@@ -11,8 +11,8 @@ uniform highp mat4 modelMatrix;
 uniform highp mat4 viewMatrix;
 uniform highp mat4 projMatrix;
 uniform highp mat4 extraMatrix;
-uniform bool textured;
+uniform UBOOL textured;
-uniform bool lightsEnabled;
+uniform UBOOL lightsEnabled;
 uniform highp vec2 texScale;
 
 const int maxLights = 8;
@@ -22,7 +22,7 @@ uniform vec4 lightsColor[maxLights];
 uniform vec4 lightsParams[maxLights];
 
 struct shadow_info {
-	bool _active;
+	UBOOL _active;
 	vec3 _color;
 	vec3 _light;
 	vec3 _point;
@@ -39,7 +39,7 @@ void main()
 	vec4 pos = modelMatrix * extraMatrix * vec4(position, 1.0);
 
 	// See http://en.wikipedia.org/wiki/Line-plane_intersection
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		pos /= pos.w;
 		vec3 l = pos.xyz - shadow._light;
 		float d = dot(shadow._point - shadow._light, shadow._normal) / dot(l, shadow._normal);
@@ -50,13 +50,13 @@ void main()
 	vec4 positionView = viewMatrix * pos;
 	gl_Position = projMatrix * positionView;
 
-	if (shadow._active) {
+	if (UBOOL_TEST(shadow._active)) {
 		Color = vec4(shadow._color, 1.0);
 	} else {
 		Color = color;
 	}
 
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		Texcoord = vec2(0.0, 1.0) + (texcoord / texScale);
 	} else {
 		Texcoord = vec2(0.0, 0.0);

engines/grim/shaders/grim_smush.fragment

@@ -3,13 +3,13 @@ in vec2 Texcoord;
 OUTPUT
 
 uniform sampler2D tex;
-uniform bool swap;
+uniform UBOOL swap;
-uniform bool swizzle;
+uniform UBOOL swizzle;
 
 void main()
 {
 	vec4 color = texture(tex, Texcoord);
-	if (swap) color.rgba = color.abgr;
+	if (UBOOL_TEST(swap)) color.rgba = color.abgr;
-	if (swizzle) color.rgba = color.bgra;
+	if (UBOOL_TEST(swizzle)) color.rgba = color.bgra;
 	outColor = vec4(color.rgb, 1.0);
 }

engines/myst3/shaders/myst3_box.fragment

@@ -2,13 +2,13 @@ in vec2 Texcoord;
 
 OUTPUT
 
-uniform bool textured;
+uniform UBOOL textured;
 uniform vec4 color;
 uniform sampler2D tex;
 
 void main()
 {
 	outColor = color;
-	if (textured)
+	if (UBOOL_TEST(textured))
 		outColor = outColor * texture(tex, Texcoord);
 }

engines/myst3/shaders/myst3_box.vertex

@@ -5,7 +5,7 @@ uniform vec2 texOffsetXY;
 uniform vec2 texSizeWH;
 uniform vec2 verOffsetXY;
 uniform vec2 verSizeWH;
-uniform bool flipY;
+uniform UBOOL flipY;
 
 out vec2 Texcoord;
 
@@ -18,7 +18,7 @@ void main()
 	pos.x = pos.x * 2.0 - 1.0;
 	pos.y = -1.0 * (pos.y * 2.0 - 1.0);
 
-	if (flipY) {
+	if (UBOOL_TEST(flipY)) {
 		pos.y *= -1.0;
 	}
 

engines/playground3d/shaders/playground3d_cube.fragment

@@ -3,12 +3,12 @@ in vec3 Color;
 
 OUTPUT
 
-uniform bool textured;
+uniform UBOOL textured;
 uniform sampler2D tex;
 
 void main() {
 	outColor = vec4(Color, 1.0);
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		outColor *= texture(tex, Texcoord);
 	}
 }

engines/playground3d/shaders/playground3d_cube.vertex

@@ -7,7 +7,7 @@ uniform mat4 mvpMatrix;
 uniform mat4 projMatrix;
 uniform mat4 modelMatrix;
 uniform mat4 rotateMatrix;
-uniform bool textured;
+uniform UBOOL textured;
 uniform vec3 modelPos;
 
 out vec2 Texcoord;
@@ -19,7 +19,7 @@ void main() {
 	vec4 pos = rotateMatrix * vec4(position, 1.0);
 	gl_Position = mvpMatrix * (pos + vec4(modelPos, 1.0));
 
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		Color = vec3(1.0);
 	} else {
 		Color = color;

engines/stark/shaders/stark_actor.fragment

@@ -3,13 +3,13 @@ in vec3 Color;
 
 OUTPUT
 
-uniform bool textured;
+uniform UBOOL textured;
 uniform sampler2D tex;
 
 void main() {
 	outColor = vec4(Color, 1.0);
 
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		outColor *= texture(tex, Texcoord);
 	}
 }

engines/stark/shaders/stark_actor.vertex

@@ -31,7 +31,7 @@ uniform vec3 bonePosition[maxBones];
 uniform Light lights[maxLights];
 uniform vec3 ambientColor;
 uniform vec3 color;
-uniform bool textured;
+uniform UBOOL textured;
 
 vec4 eyePosition;
 vec3 eyeNormal;
@@ -94,7 +94,7 @@ void main()
 	gl_Position = projectionMatrix * eyePosition;
 
 	// Set the initial vertex color
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		Color = vec3(1.0);
 	} else {
 		Color = color;

engines/stark/shaders/stark_prop.fragment

@@ -3,14 +3,14 @@ in vec3 Color;
 
 OUTPUT
 
-uniform bool textured;
+uniform UBOOL textured;
 uniform vec3 color;
 uniform sampler2D tex;
 
 void main() {
 	outColor = vec4(Color, 1.0);
 
-	if (textured) {
+	if (UBOOL_TEST(textured)) {
 		outColor *= texture(tex, Texcoord);
 	} else {
 		outColor *= vec4(color, 1.0);

engines/stark/shaders/stark_prop.vertex

@@ -21,7 +21,7 @@ const int maxLights = 10;
 uniform mat4 modelViewMatrix;
 uniform mat4 projectionMatrix;
 uniform mat3 normalMatrix;
-uniform bool doubleSided;
+uniform UBOOL doubleSided;
 uniform vec3 ambientColor;
 uniform Light lights[maxLights];
 
@@ -62,7 +62,7 @@ vec3 spotLight(vec3 position, vec3 color, float falloffNear, float falloffFar, v
 }
 
 void main() {
-	if (doubleSided) {
+	if (UBOOL_TEST(doubleSided)) {
 		Texcoord = vec2(texcoord.x, 1.0 - texcoord.y);
 	} else {
 		Texcoord = vec2(1.0 - texcoord.x, 1.0 - texcoord.y);

engines/stark/shaders/stark_surface.vertex

@@ -4,7 +4,7 @@ in vec2 texcoord;
 uniform vec2 verOffsetXY;
 uniform vec2 verSizeWH;
 uniform vec2 viewport;
-uniform bool snapToGrid;
+uniform UBOOL snapToGrid;
 
 out vec2 Texcoord;
 
@@ -14,7 +14,7 @@ void main() {
 	// Coordinates are [0.0; 1.0], transform to [-1.0; 1.0]
 	vec2 pos = verOffsetXY + position * verSizeWH;
 
-	if (snapToGrid) {
+	if (UBOOL_TEST(snapToGrid)) {
 		// Align vertex coordinates to the native pixel grid
 		// This ensures text does not get garbled by nearest neighbors scaling
 		pos.x = floor(pos.x * viewport.x + 0.5) / viewport.x;

engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex

@@ -6,6 +6,6 @@ uniform vec4 color;
 out vec4 Color;
 
 void main() {
-	gl_Position = projMatrix * vec4(position, 0.0f, 1.0);
+	gl_Position = projMatrix * vec4(position, 0.0, 1.0);
 	Color = color;
 }

engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment

@@ -3,7 +3,7 @@ in vec4 Color;
 
 uniform sampler2D tex;
 uniform float alphaRef;
-uniform bool alphaTest;
+uniform UBOOL alphaTest;
 
 OUTPUT
 
@@ -11,7 +11,7 @@ void main() {
 	vec4 texColor = texture(tex, Texcoord);
 	outColor = Color * texColor;
 
-	if (alphaTest && outColor.a < alphaRef) {
+	if (UBOOL_TEST(alphaTest) && outColor.a < alphaRef) {
 		discard;
 	}
 }

graphics/opengl/shader.cpp

@@ -64,6 +64,18 @@ static const char *compatFragment =
 		"#define OUTPUT out vec4 outColor;\n"
 	"#endif\n";
 
+// OGLES2 on AmigaOS doesn't support uniform booleans, let's introduce some shim
+#if defined(AMIGAOS)
+static const char *compatUniformBool =
+	"#define UBOOL mediump int\n"
+	"#define UBOOL_TEST(v) (v != 0)\n";
+#else
+static const char *compatUniformBool =
+	"#define UBOOL bool\n"
+	"#define UBOOL_TEST(v) v\n";
+#endif
+
+
 static const GLchar *readFile(const Common::String &filename) {
 	Common::File file;
 	Common::String shaderDir;
@@ -127,11 +139,12 @@ static GLuint createCompatShader(const char *shaderSource, GLenum shaderType, co
 	const GLchar *shaderSources[] = {
 		versionSource,
 		compatSource,
+		compatUniformBool,
 		shaderSource
 	};
 
 	GLuint shader = glCreateShader(shaderType);
-	glShaderSource(shader, 3, shaderSources, NULL);
+	glShaderSource(shader, 4, shaderSources, NULL);
 	glCompileShader(shader);
 
 	GLint status;