From: Vinson Lee <vlee@vmware.com>
Date: Fri, 16 Apr 2010 07:55:35 +0000 (-0700)
Subject: st/mesa: Remove NULL check of pointer that could not be NULL.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6c954dd12871aae2c34854498eaf696b67e3680b;p=mesa.git

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.
---

diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
index 5ac81bd4ee2..a8f2b879d53 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);
    }