KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Timothy Arceri 2016-12-02 16:44:44 +11:00
parent 6bf63b0119
commit c45d84ad83
1 changed files with 4 additions and 1 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,6 +111,9 @@ 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)
@ -127,7 +130,7 @@ update_textures(struct st_context *st,
GLboolean retval;
retval = update_single_texture(st, &sampler_view, texUnit,
prog->sh.data->Version);
glsl_version);
if (retval == GL_FALSE)
continue;