diff options
| author | Timothy Arceri <[email protected]> | 2016-11-09 15:01:29 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-12-02 13:54:54 +1100 |
| commit | 6bf63b011992dbbc899a28bde5692070dbcf965a (patch) | |
| tree | d7929ad1a09178d3b39d60ea92a374613673342b /src/mesa/state_tracker | |
| parent | ab8c01386ac1c832f3143f57091ed5cf9725c151 (diff) | |
st/mesa: get Version from gl_program rather than gl_shader_program
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_texture.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index 5fe042b37ab..58e753dab64 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -111,9 +111,6 @@ update_textures(struct st_context *st, GLbitfield free_slots = ~prog->SamplersUsed; GLbitfield external_samplers_used = prog->ExternalSamplersUsed; 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); if (samplers_used == 0x0 && old_max == 0) @@ -130,7 +127,7 @@ update_textures(struct st_context *st, GLboolean retval; retval = update_single_texture(st, &sampler_view, texUnit, - glsl_version); + prog->sh.data->Version); if (retval == GL_FALSE) continue; |