Mesa (master): i965: Remove BRW_NEW_CURBE_OFFSETS dirty bit from Gen7 atoms .
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Jan 9 21:47:07 UTC 2012
Module: Mesa
Branch: master
Commit: f497906ec0c01ec714d77bfcc2f0a38da5dafcc2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f497906ec0c01ec714d77bfcc2f0a38da5dafcc2
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jan 7 21:50:37 2012 -0800
i965: Remove BRW_NEW_CURBE_OFFSETS dirty bit from Gen7 atoms.
The BRW_NEW_CURBE_OFFSETS dirty bit is only flagged by the
brw_curbe_offsets state atom which is only used on Gen4-5.
Since it's never flagged, there's no reason to depend on it.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/drivers/dri/i965/gen7_vs_state.c | 3 +--
src/mesa/drivers/dri/i965/gen7_wm_state.c | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/gen7_vs_state.c b/src/mesa/drivers/dri/i965/gen7_vs_state.c
index f3712e5..0746e6c 100644
--- a/src/mesa/drivers/dri/i965/gen7_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_vs_state.c
@@ -105,8 +105,7 @@ upload_vs_state(struct brw_context *brw)
const struct brw_tracked_state gen7_vs_state = {
.dirty = {
.mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS,
- .brw = (BRW_NEW_CURBE_OFFSETS |
- BRW_NEW_CONTEXT |
+ .brw = (BRW_NEW_CONTEXT |
BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_VS_BINDING_TABLE |
BRW_NEW_BATCH),
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c
index e655b5c..93c4440 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c
@@ -170,7 +170,6 @@ upload_ps_state(struct brw_context *brw)
dw4 |= GEN7_PS_16_DISPATCH_ENABLE;
}
- /* BRW_NEW_CURBE_OFFSETS */
dw5 |= (brw->wm.prog_data->first_curbe_grf <<
GEN7_PS_DISPATCH_START_GRF_SHIFT_0);
dw5 |= (brw->wm.prog_data->first_curbe_grf_16 <<
@@ -197,8 +196,7 @@ upload_ps_state(struct brw_context *brw)
const struct brw_tracked_state gen7_ps_state = {
.dirty = {
.mesa = _NEW_PROGRAM_CONSTANTS,
- .brw = (BRW_NEW_CURBE_OFFSETS |
- BRW_NEW_FRAGMENT_PROGRAM |
+ .brw = (BRW_NEW_FRAGMENT_PROGRAM |
BRW_NEW_PS_BINDING_TABLE |
BRW_NEW_BATCH),
.cache = (CACHE_NEW_SAMPLER |
More information about the mesa-commit
mailing list