summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_context.h
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-01-14 05:00:22 -0800
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-02-01 23:30:23 -0800
commit21a5a133fff3ab1a068a11a32144dcb63f1d5020 (patch)
treedb49d36d680c799d849f4589d99cac3466b0eaa5 /src/gallium/drivers/r300/r300_context.h
parentbbb1c6f6298fcb1125a8170f22646f326b0ca74c (diff)
r300: Hook up state functions.
Haha, should not have attempted the scissors.
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.h')
-rw-r--r--src/gallium/drivers/r300/r300_context.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 81c559cedf..40c310abca 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -44,11 +44,6 @@ struct r300_dsa_state {
uint32_t stencil_ref_bf; /* R300_ZB_STENCILREFMASK_BF: 0x4fd4 */
};
-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 0x1
#define R300_NEW_DSA 0x2
#define R300_NEW_SCISSOR 0x4
@@ -68,7 +63,7 @@ struct r300_context {
/* Depth, stencil, and alpha state. */
struct r300_dsa_state* dsa_state;
/* Scissor state. */
- struct r300_scissor_state* scissor_state;
+ struct pipe_scissor_state* scissor_state;
/* Bitmask of dirty state objects. */
uint32_t dirty_state;
@@ -80,6 +75,7 @@ static struct r300_context* r300_context(struct pipe_context* context) {
}
/* Context initialization. */
+void r300_init_state_functions(struct r300_context* r300);
void r300_init_surface_functions(struct r300_context* r300);
struct pipe_context* r300_create_context(struct pipe_screen* screen,