Browse Source

shaderc: GLSL fixed vertex shader texture lod fetch.

Branimir Karadžić 8 years ago
parent
commit
dbd3984468

+ 3 - 2
3rdparty/glsl-optimizer/src/glsl/builtin_functions.cpp

@@ -161,8 +161,9 @@ lod_exists_in_stage(const _mesa_glsl_parse_state *state)
     */
    return state->stage == MESA_SHADER_VERTEX ||
           state->is_version(130, 300) ||
-          state->EXT_texture_array_enable || /* BK - don't complain about texture array in fragment shaders. */
-          state->OES_texture_3D_enable || /* BK - shut up */
+          state->EXT_texture_array_enable ||      /* BK - don't complain about texture array in fragment shaders. */
+          state->OES_texture_3D_enable ||         /* BK - shut up */
+          state->EXT_shader_texture_lod_enable || /* BK - pretend it's ok too */
           state->ARB_shader_texture_lod_enable;
 }
 

+ 1 - 1
3rdparty/glsl-optimizer/src/glsl/glsl_parser_extras.cpp

@@ -568,7 +568,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
    EXT(EXT_separate_shader_objects,    false, true,      dummy_true),
    EXT(EXT_shader_framebuffer_fetch,   false, true,      EXT_shader_framebuffer_fetch),
    EXT(EXT_shader_integer_mix,         true,  true,      EXT_shader_integer_mix),
-   EXT(EXT_shader_texture_lod,         false, true,      ARB_shader_texture_lod),
+   EXT(EXT_shader_texture_lod,         true,  true,      ARB_shader_texture_lod), // BK - made it available in GLSL
    EXT(EXT_shadow_samplers,            false, true,      EXT_shadow_samplers),
    EXT(EXT_texture_array,              true,  true,      EXT_texture_array), // BK - made it available in ESSL
 };