Reviewed-by: Marek Olšák <[email protected]> Marek
On Tue, Aug 5, 2014 at 8:34 AM, Michel Dänzer <[email protected]> wrote: > From: Michel Dänzer <[email protected]> > > This was a regression introduced by commit > f4b0ab7afd83c811329211eae8167c9bf238870c ('st/mesa: fix incorrect size > of UBO declarations') which caused an assertion failure while compiling > shaders of e.g. UE4 demos. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81834 > Signed-off-by: Michel Dänzer <[email protected]> > --- > src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp > b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp > index a165d6a..c5e2eb5 100644 > --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp > +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp > @@ -5113,8 +5113,7 @@ st_translate_program( > unsigned num_ubos = program->shader->NumUniformBlocks; > > for (i = 0; i < num_ubos; i++) { > - unsigned size = > - program->shader_program->UniformBlocks[i].UniformBufferSize; > + unsigned size = program->shader->UniformBlocks[i].UniformBufferSize; > unsigned num_const_vecs = (size + 15) / 16; > unsigned first, last; > assert(num_const_vecs > 0); > -- > 2.0.1 > > _______________________________________________ > mesa-dev mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
