AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Fold the gen7_cc_viewport_state_pointer atom into brw_cc_vp.

Browse Source 
These always happen together; the extra atom just means another item to
iterate through, flags to check, and a call through a function pointer.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Kenneth Graunke
2014-09-26 03:05:10 -07:00
parent f421db70ba
commit 4d67b6ab9a
4 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_cc.c
+8 -1
View File
@@ -62,7 +62,14 @@ brw_upload_cc_vp(struct brw_context *brw)
}
}
brw->state.dirty.cache |= CACHE_NEW_CC_VP;
if (brw->gen >= 7) {
BEGIN_BATCH(2);
OUT_BATCH(_3DSTATE_VIEWPORT_STATE_POINTERS_CC << 16 | (2 - 2));
OUT_BATCH(brw->cc.vp_offset);
ADVANCE_BATCH();
} else {
brw->state.dirty.cache |= CACHE_NEW_CC_VP;
}
}
const struct brw_tracked_state brw_cc_vp = {
src/mesa/drivers/dri/i965/brw_state.h
-1
View File
@@ -117,7 +117,6 @@ extern const struct brw_tracked_state gen6_vs_state;
extern const struct brw_tracked_state gen6_wm_push_constants;
extern const struct brw_tracked_state gen6_wm_state;
extern const struct brw_tracked_state gen7_depthbuffer;
extern const struct brw_tracked_state gen7_cc_viewport_state_pointer;
extern const struct brw_tracked_state gen7_clip_state;
extern const struct brw_tracked_state gen7_disable_stages;
extern const struct brw_tracked_state gen7_gs_push_constants;
src/mesa/drivers/dri/i965/brw_state_upload.c
-2
View File
@@ -190,7 +190,6 @@ static const struct brw_tracked_state *gen7_atoms[] =
&brw_state_base_address,
&brw_cc_vp,
&gen7_cc_viewport_state_pointer, /* must do after brw_cc_vp */
&gen7_sf_clip_viewport,
&gen7_push_constant_space,
@@ -265,7 +264,6 @@ static const struct brw_tracked_state *gen8_atoms[] =
&gen8_state_base_address,
&brw_cc_vp,
&gen7_cc_viewport_state_pointer, /* must do after brw_cc_vp */
&gen8_sf_clip_viewport,
&gen7_push_constant_space,
src/mesa/drivers/dri/i965/gen7_viewport_state.c
-19
View File
@@ -99,22 +99,3 @@ const struct brw_tracked_state gen7_sf_clip_viewport = {
},
.emit = gen7_upload_sf_clip_viewport,
};
/* ----------------------------------------------------- */
static void upload_cc_viewport_state_pointer(struct brw_context *brw)
{
BEGIN_BATCH(2);
OUT_BATCH(_3DSTATE_VIEWPORT_STATE_POINTERS_CC << 16 | (2 - 2));
OUT_BATCH(brw->cc.vp_offset);
ADVANCE_BATCH();
}
const struct brw_tracked_state gen7_cc_viewport_state_pointer = {
.dirty = {
.mesa = 0,
.brw = BRW_NEW_BATCH,
.cache = CACHE_NEW_CC_VP
},
.emit = upload_cc_viewport_state_pointer,
};