Mesa (master): r300g: fix warnings

Marek Olšák mareko at kemper.freedesktop.org
Sat Jul 3 02:35:21 UTC 2010


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Jul  3 04:15:06 2010 +0200

r300g: fix warnings

---

 src/gallium/drivers/r300/r300_state.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index c1bac73..4bb5757 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -879,9 +879,9 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
 
     /* Point sprites texture coordinates, 0: lower left, 1: upper right */
     float point_texcoord_left;      /* R300_GA_POINT_S0: 0x4200 */
-    float point_texcoord_bottom;    /* R300_GA_POINT_T0: 0x4204 */
+    float point_texcoord_bottom = 0;/* R300_GA_POINT_T0: 0x4204 */
     float point_texcoord_right;     /* R300_GA_POINT_S1: 0x4208 */
-    float point_texcoord_top;       /* R300_GA_POINT_T1: 0x420c */
+    float point_texcoord_top = 0;   /* R300_GA_POINT_T1: 0x420c */
     CB_LOCALS;
 
     /* Copy rasterizer state. */
@@ -974,6 +974,9 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
                 R300_GA_LINE_STIPPLE_CONFIG_STIPPLE_SCALE_MASK);
         /* XXX this might need to be scaled up */
         line_stipple_value = state->line_stipple_pattern;
+    } else {
+        line_stipple_config = 0;
+        line_stipple_value = 0;
     }
 
     if (state->flatshade) {




More information about the mesa-commit mailing list