Revert "st/mesa: get Version from gl_program rather than gl_shader_program"
This reverts commit 6bf63b0119
.
A patch that adds a reference to gl_shader_program_data to gl_program
needs to land befor this one.
This commit is contained in:
parent
6bf63b0119
commit
c45d84ad83
|
@ -111,6 +111,9 @@ update_textures(struct st_context *st,
|
||||||
GLbitfield free_slots = ~prog->SamplersUsed;
|
GLbitfield free_slots = ~prog->SamplersUsed;
|
||||||
GLbitfield external_samplers_used = prog->ExternalSamplersUsed;
|
GLbitfield external_samplers_used = prog->ExternalSamplersUsed;
|
||||||
GLuint unit;
|
GLuint unit;
|
||||||
|
struct gl_shader_program *shader =
|
||||||
|
st->ctx->_Shader->CurrentProgram[mesa_shader];
|
||||||
|
unsigned glsl_version = shader ? shader->data->Version : 0;
|
||||||
enum pipe_shader_type shader_stage = st_shader_stage_to_ptarget(mesa_shader);
|
enum pipe_shader_type shader_stage = st_shader_stage_to_ptarget(mesa_shader);
|
||||||
|
|
||||||
if (samplers_used == 0x0 && old_max == 0)
|
if (samplers_used == 0x0 && old_max == 0)
|
||||||
|
@ -127,7 +130,7 @@ update_textures(struct st_context *st,
|
||||||
GLboolean retval;
|
GLboolean retval;
|
||||||
|
|
||||||
retval = update_single_texture(st, &sampler_view, texUnit,
|
retval = update_single_texture(st, &sampler_view, texUnit,
|
||||||
prog->sh.data->Version);
|
glsl_version);
|
||||||
if (retval == GL_FALSE)
|
if (retval == GL_FALSE)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue