[Mesa-dev] [PATCH] r300g: Do not use buf param before checking for NULL.

Keith Whitwell keith.whitwell at gmail.com
Thu Nov 4 06:25:28 PDT 2010


Looks good, committed.  Thanks for fixing this.

Keith

On Wed, Nov 3, 2010 at 9:14 PM, Guillermo S. Romero
<gsromero at infernal-iceberg.com> wrote:
> Commit 8dfafbf0861fe3d2542332658dd5493851053c78 forgot to update r300g.
> There is a buf == NULL check, but buf is used before for var init.
>
> Tested-by: Guillermo S. Romero <gsromero at infernal-iceberg.com>
> ---
>  src/gallium/drivers/r300/r300_state.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
> index f2479a9..f513f87 100644
> --- a/src/gallium/drivers/r300/r300_state.c
> +++ b/src/gallium/drivers/r300/r300_state.c
> @@ -1789,7 +1789,7 @@ static void r300_set_constant_buffer(struct pipe_context *pipe,
>  {
>     struct r300_context* r300 = r300_context(pipe);
>     struct r300_constant_buffer *cbuf;
> -    uint32_t *mapped = r300_buffer(buf)->user_buffer;
> +    uint32_t *mapped;
>
>     switch (shader) {
>         case PIPE_SHADER_VERTEX:
> --
> 1.7.2.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>


More information about the mesa-dev mailing list