From c150e876b4bd8af1a0f0d7d8a76e9900045ac6be Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Thu, 2 Aug 2012 17:47:49 -0700 Subject: [PATCH] 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 [v1] Reviewed-by: Kenneth Graunke Reviewed-by: Eric Anholt Acked-by: Carl Worth --- src/glsl/main.cpp | 1 + src/mesa/main/mtypes.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index 33cd79c8544..7463cda2612 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; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 66693a75215..a43c94e6a04 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2186,6 +2186,7 @@ struct gl_shader struct gl_sl_pragmas Pragmas; unsigned Version; /**< GLSL version used for linking */ + GLboolean IsES; /**< True if this shader uses GLSL ES */ /** * \name Sampler tracking -- 2.30.2