projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_state_invariant.c
diff --git
a/src/gallium/drivers/r300/r300_state_invariant.c
b/src/gallium/drivers/r300/r300_state_invariant.c
index 97927acf1b44f65a78cd813df2089f69f86ea9fe..88ae75bb816b16941bd2ad95aa619101cc6630d6 100644
(file)
--- a/
src/gallium/drivers/r300/r300_state_invariant.c
+++ b/
src/gallium/drivers/r300/r300_state_invariant.c
@@
-38,7
+38,8
@@
struct pipe_viewport_state r300_viewport_identity = {
*
* Note that eventually this should be empty, but it's useful for development
* and general unduplication of code. */
*
* Note that eventually this should be empty, but it's useful for development
* and general unduplication of code. */
-void r300_emit_invariant_state(struct r300_context* r300, void* state)
+void r300_emit_invariant_state(struct r300_context* r300,
+ unsigned size, void* state)
{
struct r300_capabilities* caps = r300_screen(r300->context.screen)->caps;
CS_LOCALS(r300);
{
struct r300_capabilities* caps = r300_screen(r300->context.screen)->caps;
CS_LOCALS(r300);
@@
-126,7
+127,7
@@
void r300_emit_invariant_state(struct r300_context* r300, void* state)
OUT_CS_REG(R300_ZB_HIZ_PITCH, 0x00000000);
/* XXX */
OUT_CS_REG(R300_ZB_HIZ_PITCH, 0x00000000);
/* XXX */
- OUT_CS_REG(R300_SC_CLIP_RULE, 0x
aaaa
);
+ OUT_CS_REG(R300_SC_CLIP_RULE, 0x
FFFF
);
END_CS;
}
END_CS;
}