diff --git a/Test/300.frag b/Test/300.frag index 84db6963..28e030ae 100644 --- a/Test/300.frag +++ b/Test/300.frag @@ -149,6 +149,9 @@ uniform mediump; // ERROR layout(early_fragment_tests) in; // ERROR +#ifndef GL_FRAGMENT_PRECISION_HIGH +#error missing GL_FRAGMENT_PRECISION_HIGH +#endif + float imageBuffer; // ERROR, reserved float uimage2DRect; // ERROR, reserved - diff --git a/Test/baseResults/300.frag.out b/Test/baseResults/300.frag.out index 6835902b..5e33407d 100644 --- a/Test/baseResults/300.frag.out +++ b/Test/baseResults/300.frag.out @@ -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: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:152: 'imageBuffer' : Reserved word. -ERROR: 0:152: '' : syntax error +ERROR: 0:156: 'imageBuffer' : Reserved word. +ERROR: 0:156: '' : syntax error ERROR: 39 compilation errors. No code generated. diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp index cf4e7504..ba1a3e64 100644 --- a/glslang/MachineIndependent/Versions.cpp +++ b/glslang/MachineIndependent/Versions.cpp @@ -178,26 +178,15 @@ void TParseContext::initializeExtensionBehavior() const char* TParseContext::getPreamble() { if (profile == EEsProfile) { - if (version == 100) { - return - "#define GL_ES 1\n" - "#define GL_FRAGMENT_PRECISION_HIGH 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 { - 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" - ; - } + return + "#define GL_ES 1\n" + "#define GL_FRAGMENT_PRECISION_HIGH 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 { return "#define GL_FRAGMENT_PRECISION_HIGH 1\n"