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

i965: Rename gen6_*_constants tracked state atoms to "push_constants".

Browse Source 
When reading the "brw_wm_constants" and "gen6_wm_constants" atoms
side-by-side, I initially failed to notice the crucial difference:
the Gen6 atoms are for Push Constants, while brw_wm_constants handles
Pull Constants.  (Gen4/5 Push Constants are handled by "brw_curbe.")

Renaming these should clarify the code and save me from constant
confusion over the fact that "gen6_wm_constants" isn't just a newer
version of "brw_wm_constants."

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Kenneth Graunke
2011-11-03 22:41:37 -07:00
parent e4b1c9b4be
commit f3e9ccb3bc
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_state.h
+2 -2
View File
@@ -96,9 +96,9 @@ extern const struct brw_tracked_state gen6_sf_state;
extern const struct brw_tracked_state gen6_sf_vp; extern const struct brw_tracked_state gen6_sf_vp;
extern const struct brw_tracked_state gen6_urb; extern const struct brw_tracked_state gen6_urb;
extern const struct brw_tracked_state gen6_viewport_state; extern const struct brw_tracked_state gen6_viewport_state;
extern const struct brw_tracked_state gen6_vs_constants; extern const struct brw_tracked_state gen6_vs_push_constants;
extern const struct brw_tracked_state gen6_vs_state; extern const struct brw_tracked_state gen6_vs_state;
extern const struct brw_tracked_state gen6_wm_constants; 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 gen6_wm_state;
extern const struct brw_tracked_state gen7_depthbuffer; extern const struct brw_tracked_state gen7_depthbuffer;
extern const struct brw_tracked_state gen7_blend_state_pointer; extern const struct brw_tracked_state gen7_blend_state_pointer;
src/mesa/drivers/dri/i965/brw_state_upload.c
+4 -4
View File
@@ -135,8 +135,8 @@ static const struct brw_tracked_state *gen6_atoms[] =
&brw_vs_constants, /* Before vs_surfaces and constant_buffer */ &brw_vs_constants, /* Before vs_surfaces and constant_buffer */
&brw_wm_constants, /* Before wm_surfaces and constant_buffer */ &brw_wm_constants, /* Before wm_surfaces and constant_buffer */
&gen6_vs_constants, /* Before vs_state */ &gen6_vs_push_constants, /* Before vs_state */
&gen6_wm_constants, /* Before wm_state */ &gen6_wm_push_constants, /* Before wm_state */
&brw_vs_surfaces, /* must do before unit */ &brw_vs_surfaces, /* must do before unit */
&brw_wm_constant_surface, /* must do before wm surfaces/bind bo */ &brw_wm_constant_surface, /* must do before wm surfaces/bind bo */
@@ -200,8 +200,8 @@ const struct brw_tracked_state *gen7_atoms[] =
&brw_vs_constants, /* Before vs_surfaces and constant_buffer */ &brw_vs_constants, /* Before vs_surfaces and constant_buffer */
&brw_wm_constants, /* Before wm_surfaces and constant_buffer */ &brw_wm_constants, /* Before wm_surfaces and constant_buffer */
&gen6_vs_constants, /* Before vs_state */ &gen6_vs_push_constants, /* Before vs_state */
&gen6_wm_constants, /* Before wm_surfaces and constant_buffer */ &gen6_wm_push_constants, /* Before wm_surfaces and constant_buffer */
&brw_vs_surfaces, /* must do before unit */ &brw_vs_surfaces, /* must do before unit */
&brw_wm_constant_surface, /* must do before wm surfaces/bind bo */ &brw_wm_constant_surface, /* must do before wm surfaces/bind bo */
src/mesa/drivers/dri/i965/gen6_vs_state.c
+1 -1
View File
@@ -117,7 +117,7 @@ gen6_upload_vs_push_constants(struct brw_context *brw)
} }
} }
const struct brw_tracked_state gen6_vs_constants = { const struct brw_tracked_state gen6_vs_push_constants = {
.dirty = { .dirty = {
.mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS, .mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS,
.brw = (BRW_NEW_BATCH | .brw = (BRW_NEW_BATCH |
src/mesa/drivers/dri/i965/gen6_wm_state.c
+1 -1
View File
@@ -80,7 +80,7 @@ gen6_upload_wm_push_constants(struct brw_context *brw)
} }
} }
const struct brw_tracked_state gen6_wm_constants = { const struct brw_tracked_state gen6_wm_push_constants = {
.dirty = { .dirty = {
.mesa = _NEW_PROGRAM_CONSTANTS, .mesa = _NEW_PROGRAM_CONSTANTS,
.brw = (BRW_NEW_BATCH | .brw = (BRW_NEW_BATCH |