fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-28 07:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

st/mesa: get Version from gl_program rather than gl_shader_program

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri 2016-11-09 15:01:29 +11:00
parent ab8c01386a
commit 6bf63b0119
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/state_tracker/st_atom_texture.c
View file

@ -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;