projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/vec4: remove the generator hack for dual instanced GS
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
gen6_sampler_state.c
diff --git
a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
index 5416a179b55bfdc0d5edfde69901446625f28ef6..b5a0c92b3ba67f56cb161437157d5839249ac992 100644
(file)
--- a/
src/mesa/drivers/dri/i965/gen6_sampler_state.c
+++ b/
src/mesa/drivers/dri/i965/gen6_sampler_state.c
@@
-40,17
+40,18
@@
upload_sampler_state_pointers(struct brw_context *brw)
PS_SAMPLER_STATE_CHANGE |
(4 - 2));
OUT_BATCH(brw->vs.base.sampler_offset); /* VS */
PS_SAMPLER_STATE_CHANGE |
(4 - 2));
OUT_BATCH(brw->vs.base.sampler_offset); /* VS */
- OUT_BATCH(
0
); /* GS */
- OUT_BATCH(brw->wm.sampler_offset);
+ OUT_BATCH(
brw->gs.base.sampler_offset
); /* GS */
+ OUT_BATCH(brw->wm.
base.
sampler_offset);
ADVANCE_BATCH();
}
const struct brw_tracked_state gen6_sampler_state = {
.dirty = {
.mesa = 0,
ADVANCE_BATCH();
}
const struct brw_tracked_state gen6_sampler_state = {
.dirty = {
.mesa = 0,
- .brw = (BRW_NEW_BATCH |
- BRW_NEW_STATE_BASE_ADDRESS),
- .cache = CACHE_NEW_SAMPLER
+ .brw = BRW_NEW_BATCH |
+ BRW_NEW_BLORP |
+ BRW_NEW_SAMPLER_STATE_TABLE |
+ BRW_NEW_STATE_BASE_ADDRESS,
},
.emit = upload_sampler_state_pointers,
};
},
.emit = upload_sampler_state_pointers,
};