diff options
| author | Egor <egor.yusov@gmail.com> | 2018-02-16 07:48:04 +0000 |
|---|---|---|
| committer | Egor <egor.yusov@gmail.com> | 2018-02-16 07:48:04 +0000 |
| commit | 2d245809777770012de32a42ff6f91048e3797ca (patch) | |
| tree | c79e7cff37407eddcef4d1b415b2c3ef5f8747e2 /Graphics | |
| parent | Updated NDKHelper.java (diff) | |
| download | DiligentCore-2d245809777770012de32a42ff6f91048e3797ca.tar.gz DiligentCore-2d245809777770012de32a42ff6f91048e3797ca.zip | |
Updated GLSL definitions on Android
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h | 2 | ||||
| -rw-r--r-- | Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h b/Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h index 86c8e0ce..cdf517d1 100644 --- 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 index 18b8225b..cda30cef 100644 --- 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" |