summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-10-27 09:02:00 -0700
committerVinson Lee <[email protected]>2010-10-27 09:02:00 -0700
commit3c8106402f970aac61981381b1c9988504d3765d (patch)
tree8e127787ae610368aaade98086cc3dc5132a9e1f
parent8ad9d83fdfc609303cebba3d811064b91aed6b0b (diff)
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
-rw-r--r--src/gallium/drivers/r300/r300_state_derived.c5
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 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;