Mesa (master): r300g: Do not use buf param before checking for NULL.

Keith Whitwell keithw at kemper.freedesktop.org
Thu Nov 4 13:26:37 UTC 2010


Module: Mesa
Branch: master
Commit: 560ad7e59940423a696e93e62ec3c41b1e553421
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=560ad7e59940423a696e93e62ec3c41b1e553421

Author: Guillermo S. Romero <gsromero at infernal-iceberg.com>
Date:   Wed Nov  3 22:14:00 2010 +0100

r300g: Do not use buf param before checking for NULL.

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:




More information about the mesa-commit mailing list