r300-gallium: Fix compiler warnings.

"const" is the right keyword, but I can't do that without adding a bunch
of really annoying and ugly const casts everywhere, and frankly,
that's really stupid, so instead, just don't make them const.

diff --git a/src/gallium/drivers/r300/r300_state_shader.h b/src/gallium/drivers/r300/r300_state_shader.h
index 3c5f036d2aebb4794c12c08f865fa68f001ed93c..76f2989fd13b2e25b1eee7ee27cec2a5f8677ad7 100644 (file)
--- a/src/gallium/drivers/r300/r300_state_shader.h
+++ b/src/gallium/drivers/r300/r300_state_shader.h
@@ -104,7 +104,7 @@ struct r300_fs_asm {
 void r300_translate_fragment_shader(struct r300_context* r300,
                            struct r3xx_fragment_shader* fs);
 
-static const struct r300_fragment_shader r300_passthrough_fragment_shader = {
+static struct r300_fragment_shader r300_passthrough_fragment_shader = {
     /* XXX This is the emission code. TODO: decode
     OUT_CS_REG(R300_US_CONFIG, 0);
     OUT_CS_REG(R300_US_CODE_OFFSET, 0x0);
@@ -132,7 +132,7 @@ static const struct r300_fragment_shader r300_passthrough_fragment_shader = {
         R300_ALPHA_ADDR1(0) | R300_ALPHA_ADDR2(0) | R300_ALU_DSTA_OUTPUT,
 };
 
-static const struct r500_fragment_shader r500_passthrough_fragment_shader = {
+static struct r500_fragment_shader r500_passthrough_fragment_shader = {
     .shader.stack_size = 0,
     .instruction_count = 1,
     .instructions[0].inst0 = R500_INST_TYPE_OUT |
@@ -158,7 +158,7 @@ static const struct r500_fragment_shader r500_passthrough_fragment_shader = {
         R500_ALU_RGBA_A_SWIZ_0,
 };
 
-static const struct r300_fragment_shader r300_texture_fragment_shader = {
+static struct r300_fragment_shader r300_texture_fragment_shader = {
     /* XXX This is the emission code. TODO: decode
     OUT_CS_REG(R300_US_CONFIG, 0);
     OUT_CS_REG(R300_US_CODE_OFFSET, 0x0);
@@ -186,7 +186,7 @@ static const struct r300_fragment_shader r300_texture_fragment_shader = {
         R300_ALPHA_ADDR1(0) | R300_ALPHA_ADDR2(0) | R300_ALU_DSTA_OUTPUT,
 };
 
-static const struct r500_fragment_shader r500_texture_fragment_shader = {
+static struct r500_fragment_shader r500_texture_fragment_shader = {
     .shader.stack_size = 0,
     .instruction_count = 1,
     .instructions[0].inst0 = R500_INST_TYPE_OUT |

diff --git a/src/gallium/drivers/r300/r300_surface.h b/src/gallium/drivers/r300/r300_surface.h
index aa34054326c324f8bb75d2be327a85c3ffff24e5..36090882f134b6328a2e3b4ee0725a7dcab72215 100644 (file)
--- a/src/gallium/drivers/r300/r300_surface.h
+++ b/src/gallium/drivers/r300/r300_surface.h
@@ -35,20 +35,20 @@
 #include "r300_state_tcl.h"
 #include "r300_state_inlines.h"
 
-const struct r300_blend_state blend_clear_state = {
+static struct r300_blend_state blend_clear_state = {
     .blend_control = 0x0,
     .alpha_blend_control = 0x0,
     .rop = 0x0,
     .dither = 0x0,
 };
 
-const struct r300_blend_color_state blend_color_clear_state = {
+static struct r300_blend_color_state blend_color_clear_state = {
     .blend_color = 0x0,
     .blend_color_red_alpha = 0x0,
     .blend_color_green_blue = 0x0,
 };
 
-const struct r300_dsa_state dsa_clear_state = {
+static struct r300_dsa_state dsa_clear_state = {
     .alpha_function = 0x0,
     .alpha_reference = 0x0,
     .z_buffer_control = 0x0,
@@ -58,7 +58,7 @@ const struct r300_dsa_state dsa_clear_state = {
     .stencil_ref_bf = 0x0,
 };
 
-const struct r300_rs_state rs_clear_state = {
+static struct r300_rs_state rs_clear_state = {
     .point_minmax = 0x36000006,
     .line_control = 0x00030006,
     .depth_scale_front = 0x0,
@@ -72,7 +72,7 @@ const struct r300_rs_state rs_clear_state = {
     .color_control = R300_SHADE_MODEL_FLAT,
 };
 
-const struct r300_rs_block r300_rs_block_clear_state = {
+static struct r300_rs_block r300_rs_block_clear_state = {
     .ip[0] = R500_RS_SEL_S(R300_RS_SEL_K0) |
         R500_RS_SEL_T(R300_RS_SEL_K0) |
         R500_RS_SEL_R(R300_RS_SEL_K0) |
@@ -82,7 +82,7 @@ const struct r300_rs_block r300_rs_block_clear_state = {
     .inst_count = 0,
 };
 
-const struct r300_rs_block r500_rs_block_clear_state = {
+static struct r300_rs_block r500_rs_block_clear_state = {
     .ip[0] = R500_RS_SEL_S(R500_RS_IP_PTR_K0) |
         R500_RS_SEL_T(R500_RS_IP_PTR_K0) |
         R500_RS_SEL_R(R500_RS_IP_PTR_K0) |
@@ -94,7 +94,7 @@ const struct r300_rs_block r500_rs_block_clear_state = {
 
 /* The following state is used for surface_copy only. */
 
-const struct r300_rs_block r300_rs_block_copy_state = {
+static struct r300_rs_block r300_rs_block_copy_state = {
     .ip[0] = R500_RS_SEL_S(R300_RS_SEL_K0) |
         R500_RS_SEL_T(R300_RS_SEL_K0) |
         R500_RS_SEL_R(R300_RS_SEL_K0) |
@@ -104,7 +104,7 @@ const struct r300_rs_block r300_rs_block_copy_state = {
     .inst_count = R300_RS_TX_OFFSET(6),
 };
 
-const struct r300_rs_block r500_rs_block_copy_state = {
+static struct r300_rs_block r500_rs_block_copy_state = {
     .ip[0] = R500_RS_SEL_S(R500_RS_IP_PTR_K0) |
         R500_RS_SEL_T(R500_RS_IP_PTR_K0) |
         R500_RS_SEL_R(R500_RS_IP_PTR_K0) |
@@ -114,7 +114,7 @@ const struct r300_rs_block r500_rs_block_copy_state = {
     .inst_count = R300_RS_TX_OFFSET(6),
 };
 
-const struct r300_sampler_state r300_sampler_copy_state = {
+static struct r300_sampler_state r300_sampler_copy_state = {
     .filter0 = R300_TX_WRAP_S(R300_TX_CLAMP) |
         R300_TX_WRAP_T(R300_TX_CLAMP) |
         R300_TX_MAG_FILTER_NEAREST |