From: Eric Anholt Date: Thu, 13 Jun 2013 17:24:36 +0000 (-0700) Subject: mesa: Fix missing setting of shader->IsES. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88398a817c7402c8fa56823eaac4c755e5c2fdaf;p=mesa.git mesa: Fix missing setting of shader->IsES. I noticed this while trying to merge code with the builtin compiler, which does set it. Note that this causes two regressions in piglit in default-precision-sampler.* which try to link without a vertex or fragment shader, due to being run under the desktop glslparsertest binary (using ARB_ES3_compatibility) that doesn't know about this requirement. Reviewed-by: Kenneth Graunke Reviewed-by: Paul Berry --- diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 2739df72577..a91597435db 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3155,6 +3155,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader) shader->CompileStatus = !state->error; shader->InfoLog = state->info_log; shader->Version = state->language_version; + shader->IsES = state->es_shader; memcpy(shader->builtins_to_link, state->builtins_to_link, sizeof(shader->builtins_to_link[0]) * state->num_builtins_to_link); shader->num_builtins_to_link = state->num_builtins_to_link;