[Mesa-dev] [PATCH] mesa/st: Fix NULL access if no fragment shader is bound

[Marek Olšák]

Pushed, thanks.

Marek

On Mon, Mar 28, 2016 at 5:01 PM, Bas Nieuwenhuizen
<bas at basnieuwenhuizen.nl> wrote:
> Signed-off-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
> ---
>  src/mesa/state_tracker/st_atom_constbuf.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
> index 4d9b344..a980dbe 100644
> --- a/src/mesa/state_tracker/st_atom_constbuf.c
> +++ b/src/mesa/state_tracker/st_atom_constbuf.c
> @@ -65,8 +65,8 @@ void st_upload_constants( struct st_context *st,
>            shader_type == PIPE_SHADER_COMPUTE);
>
>     /* update the ATI constants before rendering */
> -   struct ati_fragment_shader *ati_fs = st->fp->ati_fs;
> -   if (shader_type == PIPE_SHADER_FRAGMENT && ati_fs) {
> +   if (shader_type == PIPE_SHADER_FRAGMENT && st->fp->ati_fs) {
> +      struct ati_fragment_shader *ati_fs = st->fp->ati_fs;
>        unsigned c;
>
>        for (c = 0; c < MAX_NUM_FRAGMENT_CONSTANTS_ATI; c++) {
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev