summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_context.h
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2009-01-22 03:45:14 -0800
committerCorbin Simpson <[email protected]>2009-02-01 23:30:25 -0800
commit90a96cb2addf48b3b48c039a8dc6de9e53bfb6df (patch)
treed74ab3b12c448c88a0f3c7d8624e334eadf11dc8 /src/gallium/drivers/r300/r300_context.h
parent0ff7cb7c89f0c9ac4e363296e53eada008717252 (diff)
r300: Add sampler state skeleton.
Heh, serendipitous sibilance. Anyway, need to flesh this out.
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.h')
-rw-r--r--src/gallium/drivers/r300/r300_context.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index f4d801480a6..3877c9855d6 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -65,17 +65,21 @@ struct r300_rs_state {
uint32_t cull_mode; /* R300_SU_CULL_MODE: 0x42b8 */
};
+struct r300_sampler_state {
+};
+
struct r300_scissor_state {
uint32_t scissor_top_left; /* R300_SC_SCISSORS_TL: 0x43e0 */
uint32_t scissor_bottom_right; /* R300_SC_SCISSORS_BR: 0x43e4 */
};
-#define R300_NEW_BLEND 0x01
-#define R300_NEW_BLEND_COLOR 0x02
-#define R300_NEW_DSA 0x04
-#define R300_NEW_RS 0x08
-#define R300_NEW_SCISSOR 0x10
-#define R300_NEW_KITCHEN_SINK 0x1f
+#define R300_NEW_BLEND 0x0001
+#define R300_NEW_BLEND_COLOR 0x0002
+#define R300_NEW_DSA 0x0004
+#define R300_NEW_RS 0x0008
+#define R300_NEW_SAMPLER 0x0010
+#define R300_NEW_SCISSOR 0x1000
+#define R300_NEW_KITCHEN_SINK 0x1fff
struct r300_context {
/* Parent class */
@@ -95,9 +99,11 @@ struct r300_context {
struct r300_dsa_state* dsa_state;
/* Rasterizer state. */
struct r300_rs_state* rs_state;
+ /* Sampler states. */
+ struct r300_sampler_state* sampler_states[8];
+ int sampler_count;
/* Scissor state. */
struct r300_scissor_state* scissor_state;
-
/* Bitmask of dirty state objects. */
uint32_t dirty_state;
/* Flag indicating whether or not the HW is dirty. */