Updated GLSL definitions on Android

TheMostDiligent · TheMostDiligent · commit 2d2458097777 · 2018-02-15T23:48:04.000-08:00
diff --git a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h
@@ -160,7 +160,7 @@ uvec2 asuint( vec2  x ){ return floatBitsToUint(x); }
 uvec3 asuint( vec3  x ){ return floatBitsToUint(x); }
 uvec4 asuint( vec4  x ){ return floatBitsToUint(x); }
 
-#if !defined(GL_ES) && (__VERSION__>=420)
+#if defined(GL_ES) && (__VERSION__>=310) || !defined(GL_ES) && (__VERSION__>=420)
 float f16tof32( uint u1 )
 {
     return unpackHalf2x16( u1 ).x;
diff --git a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h
@@ -160,7 +160,7 @@
 "uvec3 asuint( vec3  x ){ return floatBitsToUint(x); }\n"
 "uvec4 asuint( vec4  x ){ return floatBitsToUint(x); }\n"
 "\n"
-"#if !defined(GL_ES) && (__VERSION__>=420)\n"
+"#if defined(GL_ES) && (__VERSION__>=310) || !defined(GL_ES) && (__VERSION__>=420)\n"
 "float f16tof32( uint u1 )\n"
 "{\n"
 "    return unpackHalf2x16( u1 ).x;\n"

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ uvec2 asuint( vec2 x ){ return floatBitsToUint(x); }`
`160`	`160`	`uvec3 asuint( vec3 x ){ return floatBitsToUint(x); }`
`161`	`161`	`uvec4 asuint( vec4 x ){ return floatBitsToUint(x); }`
`162`	`162`
`163`		`-#if !defined(GL_ES) && (__VERSION__>=420)`
	`163`	`+#if defined(GL_ES) && (__VERSION__>=310) \|\| !defined(GL_ES) && (__VERSION__>=420)`
`164`	`164`	`float f16tof32( uint u1 )`
`165`	`165`	`{`
`166`	`166`	`return unpackHalf2x16( u1 ).x;`