From: Vinson Lee <vlee@vmware.com>
Date: Wed, 27 Oct 2010 16:02:00 +0000 (-0700)
Subject: r300g: Silence uninitialized variable warning.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3c8106402f970aac61981381b1c9988504d3765d;p=mesa.git

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

diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 730ef7a3ee2..efec9495104 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;