[Mesa-dev] [PATCH 50/58] st/mesa: get Version from gl_program rather than gl_shader_program

[Timothy Arceri]

On Thu, 2016-12-01 at 12:38 +0100, Nicolai Hähnle wrote:
> Hmm, I wonder what the rules are when different shaders have
> different 
> versions and are linked together?

Yeah I was wondering the same when I changed this. It seems that in
linker.cpp we get the max version from the shaders and store it here.


> Then again, the use of the 
> glsl_version in st_sampler_view.c pretty much admits that it's
> already a 
> hack, so I think this is fine.
> 
> Patches 49 & 50:
> 
> Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

Thanks for the reviews :)

> 
> On 20.11.2016 14:29, Timothy Arceri wrote:
> > 
> > ---
> >  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;
> > 
> > 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev