summaryrefslogtreecommitdiffstats
path: root/src/glsl/main.cpp
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2012-08-02 17:47:49 -0700
committerIan Romanick <ian.d.romanick@intel.com>2012-12-06 12:13:22 -0800
commitc150e876b4bd8af1a0f0d7d8a76e9900045ac6be (patch)
tree8d9ddaded1810164245f0add5e2df91cb14dfb07 /src/glsl/main.cpp
parent2b4aeddfb3cdae95d69e7f46eac87514f372f531 (diff)
downloadexternal_mesa3d-c150e876b4bd8af1a0f0d7d8a76e9900045ac6be.zip
external_mesa3d-c150e876b4bd8af1a0f0d7d8a76e9900045ac6be.tar.gz
external_mesa3d-c150e876b4bd8af1a0f0d7d8a76e9900045ac6be.tar.bz2
glsl: Record in gl_shader whether the shader uses GLSL ES.
Previously we recorded just the GLSL version, with the knowledge that 100 means GLSL 1.00 ES. With the advent of GLSL 3.00 ES, this is going to get more complex, and eventually will probably become ambiguous (GLSL 4.00 already exists, and GLSL 4.00 ES is likely to be created some day). To reduce confusion, this patch simply records whether the shader is GLSL ES as an explicit boolean. [v2, idr]: s/IsEs(Shader|Prog)/IsES/ Suggested by Ken and Eric. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> [v1] Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'src/glsl/main.cpp')
-rw-r--r--src/glsl/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 33cd79c..7463cda 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -190,6 +190,7 @@ compile_shader(struct gl_context *ctx, struct gl_shader *shader)
shader->symbols = state->symbols;
shader->CompileStatus = !state->error;
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;