mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 10:50:10 +01:00
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>
This commit is contained in:
parent
2b4aeddfb3
commit
c150e876b4
2 changed files with 2 additions and 0 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue