diff options
| author | Kenneth Graunke <[email protected]> | 2011-07-13 02:32:43 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-07-18 14:14:36 -0700 |
| commit | 348bdaa529c3eb60fcf03ed4531193bbf2e12491 (patch) | |
| tree | 1f39dd73dfde80d2184958c484deee1a554acbb6 | |
| parent | 797522f1c9c0f4aa75e4c9c854e79c44ed374169 (diff) | |
i965: Rename CMD_VF_STATISTICS_(965|GM45) to include "3DSTATE".
Including the full "3DSTATE_VF_STATISTICS" should make it easier to
cross-reference the code and documentation.
Also, move the 965/GM45 suffix to the beginning for consistency with
newer #defines.
Signed-off-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_defines.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index ac683bd9960..e00e24885ad 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -166,7 +166,7 @@ GLboolean brwCreateContext( int api, ctx->Const.QuadsFollowProvokingVertexConvention = GL_FALSE; if (intel->is_g4x || intel->gen >= 5) { - brw->CMD_VF_STATISTICS = CMD_VF_STATISTICS_GM45; + brw->CMD_VF_STATISTICS = GM45_3DSTATE_VF_STATISTICS; brw->CMD_PIPELINE_SELECT = CMD_PIPELINE_SELECT_GM45; brw->has_surface_tile_offset = GL_TRUE; if (intel->gen < 6) @@ -174,7 +174,7 @@ GLboolean brwCreateContext( int api, brw->has_aa_line_parameters = GL_TRUE; brw->has_pln = GL_TRUE; } else { - brw->CMD_VF_STATISTICS = CMD_VF_STATISTICS_965; + brw->CMD_VF_STATISTICS = GEN4_3DSTATE_VF_STATISTICS; brw->CMD_PIPELINE_SELECT = CMD_PIPELINE_SELECT_965; } diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index 209a8f9d0d6..0a3027d04ad 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -927,8 +927,8 @@ # define BRW_VE1_DST_OFFSET_SHIFT 0 #define CMD_INDEX_BUFFER 0x780a -#define CMD_VF_STATISTICS_965 0x780b -#define CMD_VF_STATISTICS_GM45 0x680b +#define GEN4_3DSTATE_VF_STATISTICS 0x780b +#define GM45_3DSTATE_VF_STATISTICS 0x680b #define _3DSTATE_CC_STATE_POINTERS 0x780e /* GEN6+ */ #define _3DSTATE_BLEND_STATE_POINTERS 0x7824 /* GEN7+ */ #define _3DSTATE_DEPTH_STENCIL_STATE_POINTERS 0x7825 /* GEN7+ */ |