mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include GL_FRAGMENT_PRECISION_HIGH in ES 300/310.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@28494 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-10-08 16:31:44 +00:00
parent 39805bb3f7
commit 39cf638945
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Test/300.frag
View File

@@ -149,6 +149,9 @@ uniform mediump; // ERROR
layout(early_fragment_tests) in; // ERROR layout(early_fragment_tests) in; // ERROR
#ifndef GL_FRAGMENT_PRECISION_HIGH
#error missing GL_FRAGMENT_PRECISION_HIGH
#endif
float imageBuffer; // ERROR, reserved float imageBuffer; // ERROR, reserved
float uimage2DRect; // ERROR, reserved float uimage2DRect; // ERROR, reserved

4
Test/baseResults/300.frag.out
View File

@@ -36,8 +36,8 @@ ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset,
ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset] ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:148: 'qualifier' : cannot use auxiliary, memory, interpolation, or precision qualifier in a default qualifier declaration (declaration with no type) ERROR: 0:148: 'qualifier' : cannot use auxiliary, memory, interpolation, or precision qualifier in a default qualifier declaration (declaration with no type)
ERROR: 0:150: 'early_fragment_tests' : not supported for this version or the enabled extensions ERROR: 0:150: 'early_fragment_tests' : not supported for this version or the enabled extensions
ERROR: 0:152: 'imageBuffer' : Reserved word. ERROR: 0:156: 'imageBuffer' : Reserved word.
ERROR: 0:152: '' : syntax error ERROR: 0:156: '' : syntax error
ERROR: 39 compilation errors. No code generated. ERROR: 39 compilation errors. No code generated.

29
glslang/MachineIndependent/Versions.cpp
View File

@@ -178,26 +178,15 @@ void TParseContext::initializeExtensionBehavior()
const char* TParseContext::getPreamble() const char* TParseContext::getPreamble()
{ {
if (profile == EEsProfile) { if (profile == EEsProfile) {
if (version == 100) { return
return "#define GL_ES 1\n"
"#define GL_ES 1\n" "#define GL_FRAGMENT_PRECISION_HIGH 1\n"
"#define GL_FRAGMENT_PRECISION_HIGH 1\n" "#define GL_OES_texture_3D 1\n"
"#define GL_OES_texture_3D 1\n" "#define GL_OES_standard_derivatives 1\n"
"#define GL_OES_standard_derivatives 1\n" "#define GL_EXT_frag_depth 1\n"
"#define GL_EXT_frag_depth 1\n" "#define GL_OES_EGL_image_external 1\n"
"#define GL_OES_EGL_image_external 1\n" "#define GL_EXT_shader_texture_lod 1\n"
"#define GL_EXT_shader_texture_lod 1\n" ;
;
} else {
return
"#define GL_ES 1\n"
"#define GL_OES_texture_3D 1\n"
"#define GL_OES_standard_derivatives 1\n"
"#define GL_EXT_frag_depth 1\n"
"#define GL_OES_EGL_image_external 1\n"
"#define GL_EXT_shader_texture_lod 1\n"
;
}
} else { } else {
return return
"#define GL_FRAGMENT_PRECISION_HIGH 1\n" "#define GL_FRAGMENT_PRECISION_HIGH 1\n"