Module: Mesa Branch: master Commit: 6c954dd12871aae2c34854498eaf696b67e3680b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c954dd12871aae2c34854498eaf696b67e3680b
Author: Vinson Lee <[email protected]> Date: Fri Apr 16 00:55:35 2010 -0700 st/mesa: Remove NULL check of pointer that could not be NULL. cbuf has been dereferenced twice earlier in the same if-block. It is either not NULL or a crash has already occurred. --- src/mesa/state_tracker/st_atom_constbuf.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index 5ac81bd..a8f2b87 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -84,10 +84,9 @@ void st_upload_constants( struct st_context *st, } /* load Mesa constants into the constant buffer */ - if (cbuf) - st_no_flush_pipe_buffer_write(st, *cbuf, - 0, paramBytes, - params->ParameterValues); + st_no_flush_pipe_buffer_write(st, *cbuf, + 0, paramBytes, + params->ParameterValues); st->pipe->set_constant_buffer(st->pipe, shader_type, 0, *cbuf); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
