Mesa (master): r300g: Silence uninitialized variable warning.

Vinson Lee vlee at kemper.freedesktop.org
Wed Oct 27 16:03:29 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Wed Oct 27 09:02:00 2010 -0700

r300g: Silence uninitialized variable warning.

Fixes this GCC warning.
r300_state_derived.c: In function 'r300_update_derived_state':
r300_state_derived.c:593: warning: 'r' may be used uninitialized in this function
r300_state_derived.c:593: note: 'r' was declared here

---

 src/gallium/drivers/r300/r300_state_derived.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 730ef7a..efec949 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -633,6 +633,11 @@ static uint32_t r300_get_border_color(enum pipe_format format,
                 ((float_to_ubyte(border_swizzled[0]) & 0xff) << 16) |
                 ((float_to_ubyte(border_swizzled[3]) & 0xff) << 24);
             break;
+
+        default:
+            assert(0);
+            r = 0;
+            break;
     }
 
     return r;




More information about the mesa-commit mailing list