summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_surface.h
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2009-04-01 15:24:28 -0700
committerCorbin Simpson <[email protected]>2009-04-01 15:24:28 -0700
commit28fa809c9eb9168ab6b80fd66c7cf6ce2b9ccf98 (patch)
treeb27c072c29d876c4eb0ebcf385abd488f7cb9f08 /src/gallium/drivers/r300/r300_surface.h
parentc4fb791909e687d5af5b95d88ebd6332c82c3095 (diff)
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.
Diffstat (limited to 'src/gallium/drivers/r300/r300_surface.h')
-rw-r--r--src/gallium/drivers/r300/r300_surface.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/r300/r300_surface.h b/src/gallium/drivers/r300/r300_surface.h
index aa34054326c..36090882f13 100644
--- 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 |