On Thu, 2017-01-05 at 15:30 +0900, Michel Dänzer wrote: > On 20/12/16 07:37 PM, Timothy Arceri wrote: > > Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com> > > --- > > src/mesa/state_tracker/st_atom_texture.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/src/mesa/state_tracker/st_atom_texture.c > > b/src/mesa/state_tracker/st_atom_texture.c > > index 5fe042b..58e753d 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; > > > > > > This change broke a bunch of piglit tests > (spec@ext_framebuffer_object@fbo-depthtex and some of the tests in > spec@arb_fragment_program(_shadow) with radeonsi and llvmpipe, > because > prog->sh.data == NULL.
Hmm that shouldn't be able to happen. Let me take a look. > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
