From 90ba135c30d63b97fcfbcc088d0dee9ed67a351e Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Wed, 24 Jan 2018 20:16:06 -0800
Subject: Enabled File2String on Mac; updated GLSLDefinitions to disable
 functions unsupported in GL4.1

---
 Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h     | 9 +++++----
 Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'Graphics')

diff --git a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h
index ccaddac2..86c8e0ce 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h
@@ -160,10 +160,10 @@ 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)
 float f16tof32( uint u1 )
-{ 
-    return unpackHalf2x16( u1 ).x; 
+{
+    return unpackHalf2x16( u1 ).x;
 }
 vec2 f16tof32( uvec2 u2 )
 { 
@@ -185,7 +185,7 @@ vec4  f16tof32( ivec4 i4 ){ return f16tof32( uvec4( i4 ) ); }
 
 uint f32tof16( float f )
 { 
-    return packHalf2x16( vec2( f, 0.0 ) ) & 0x0ffffu; 
+    return packHalf2x16( vec2( f, 0.0 ) ) & 0x0ffffu;
 }
 uvec2 f32tof16( vec2 f2 )
 { 
@@ -200,6 +200,7 @@ uvec4 f32tof16( vec4 f4 )
 {
     return uvec4( f32tof16( f4.xy ), f32tof16( f4.zw ) );
 }
+#endif
 
 #ifndef GL_ES // double is not supported on GLES
 double asdouble(uint lowbits, uint highbits)
diff --git a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h
index cf5dbfcf..18b8225b 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h
@@ -160,10 +160,10 @@
 "uvec3 asuint( vec3  x ){ return floatBitsToUint(x); }\n"
 "uvec4 asuint( vec4  x ){ return floatBitsToUint(x); }\n"
 "\n"
-"\n"
+"#if !defined(GL_ES) && (__VERSION__>=420)\n"
 "float f16tof32( uint u1 )\n"
-"{ \n"
-"    return unpackHalf2x16( u1 ).x; \n"
+"{\n"
+"    return unpackHalf2x16( u1 ).x;\n"
 "}\n"
 "vec2 f16tof32( uvec2 u2 )\n"
 "{ \n"
@@ -185,7 +185,7 @@
 "\n"
 "uint f32tof16( float f )\n"
 "{ \n"
-"    return packHalf2x16( vec2( f, 0.0 ) ) & 0x0ffffu; \n"
+"    return packHalf2x16( vec2( f, 0.0 ) ) & 0x0ffffu;\n"
 "}\n"
 "uvec2 f32tof16( vec2 f2 )\n"
 "{ \n"
@@ -200,6 +200,7 @@
 "{\n"
 "    return uvec4( f32tof16( f4.xy ), f32tof16( f4.zw ) );\n"
 "}\n"
+"#endif\n"
 "\n"
 "#ifndef GL_ES // double is not supported on GLES\n"
 "double asdouble(uint lowbits, uint highbits)\n"
-- 
cgit v1.2.3