mesa/compiler: add stage to shader_info

This will allow us to simplify the current program logic for SSO.

Also since we aim to detach shader_info from nir_shader this will come
in handy avoiding passing nir_shader around just to keep track of
the stage we are dealing with.

V2: set stage for arb asm programs also.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Timothy Arceri
2016-10-31 19:57:57 +11:00
parent 88b41239f9
commit 0de6f6223a
2 changed files with 4 additions and 0 deletions

View File

@@ -32,6 +32,9 @@ extern "C" {
#endif
typedef struct shader_info {
/** The shader stage, such as MESA_SHADER_VERTEX. */
gl_shader_stage stage;
const char *name;
/* Descriptive name provided by the client; may be NULL */

View File

@@ -190,6 +190,7 @@ _mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint id)
prog->Target = target;
prog->RefCount = 1;
prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
prog->info.stage = _mesa_program_enum_to_shader_stage(target);
/* default mapping from samplers to texture units */
for (i = 0; i < MAX_SAMPLERS; i++)