From dbd39844681be546edac2cac5a0f76d20d468f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 13 Nov 2017 17:39:48 -0800 Subject: [PATCH] shaderc: GLSL fixed vertex shader texture lod fetch. --- 3rdparty/glsl-optimizer/src/glsl/builtin_functions.cpp | 5 +++-- 3rdparty/glsl-optimizer/src/glsl/glsl_parser_extras.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/3rdparty/glsl-optimizer/src/glsl/builtin_functions.cpp b/3rdparty/glsl-optimizer/src/glsl/builtin_functions.cpp index 34d26b0cb..371eadfd5 100644 --- a/3rdparty/glsl-optimizer/src/glsl/builtin_functions.cpp +++ b/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; } diff --git a/3rdparty/glsl-optimizer/src/glsl/glsl_parser_extras.cpp b/3rdparty/glsl-optimizer/src/glsl/glsl_parser_extras.cpp index d4a01efb7..474118529 100644 --- a/3rdparty/glsl-optimizer/src/glsl/glsl_parser_extras.cpp +++ b/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 };