summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2010-07-03 04:15:06 +0200
committerMarek Olšák <[email protected]>2010-07-03 04:32:41 +0200
commit0e6d7ce0178d65787e3e10f56638c2f0a88296f1 (patch)
treee1ee2991804ec974973e949c70f71fd13331bd78 /src
parent7da9e1e61b4dbd627404941f72d2f7a40dc9153b (diff)
r300g: fix warnings
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/r300/r300_state.c7
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 c1bac7328e7..4bb57576899 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) {