[Mesa-dev] [PATCH] main: fix a regression in uniform handling introduced by 87a4bc5

Samuel Pitoiset samuel.pitoiset at gmail.com
Thu Jun 4 04:23:11 PDT 2015


This patch also fixes an issue I reported to Martin this morning on IRC.
It fixes bin/arb_texture_multisample-texelfetch 5 -auto with Nouveau 
(and probably with some other drivers).
Thanks.

On 06/04/2015 01:19 PM, Martin Peres wrote:
> The comment was accurate but the condition was reversed...
>
> Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
> ---
>   src/mesa/program/ir_to_mesa.cpp | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
> index 50b86ad..514bb93 100644
> --- a/src/mesa/program/ir_to_mesa.cpp
> +++ b/src/mesa/program/ir_to_mesa.cpp
> @@ -2410,7 +2410,7 @@ _mesa_associate_uniform_storage(struct gl_context *ctx,
>            &shader_program->UniformStorage[location];
>   
>         /* Do not associate any uniform storage to built-in uniforms */
> -      if (!storage->builtin)
> +      if (storage->builtin)
>            continue;
>   
>         if (location != last_location) {



More information about the mesa-dev mailing list