diff options
| author | Kenneth Graunke <[email protected]> | 2011-07-12 23:08:01 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-07-18 14:14:36 -0700 |
| commit | 797522f1c9c0f4aa75e4c9c854e79c44ed374169 (patch) | |
| tree | 4fdfb57d2ebccd43d700d408501096ae3168ff9c | |
| parent | 29a911c50e4443dfebef0a2e32c39b64992fa3cc (diff) | |
i965: Rename CMD_VERTEX_(BUFFER|ELEMENT) to 3DSTATE_VERTEX_...S.
This makes our code use the same names as the documentation.
Signed-off-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_defines.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index a75171da316..209a8f9d0d6 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -895,7 +895,7 @@ #define _3DSTATE_SAMPLER_STATE_POINTERS_GS 0x782E /* GEN7+ */ #define _3DSTATE_SAMPLER_STATE_POINTERS_PS 0x782F /* GEN7+ */ -#define CMD_VERTEX_BUFFER 0x7808 +#define _3DSTATE_VERTEX_BUFFERS 0x7808 # define BRW_VB0_INDEX_SHIFT 27 # define GEN6_VB0_INDEX_SHIFT 26 # define BRW_VB0_ACCESS_VERTEXDATA (0 << 26) @@ -905,7 +905,7 @@ # define GEN7_VB0_ADDRESS_MODIFYENABLE (1 << 14) # define BRW_VB0_PITCH_SHIFT 0 -#define CMD_VERTEX_ELEMENT 0x7809 +#define _3DSTATE_VERTEX_ELEMENTS 0x7809 # define BRW_VE0_INDEX_SHIFT 27 # define GEN6_VE0_INDEX_SHIFT 26 # define BRW_VE0_FORMAT_SHIFT 16 diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 32a1d297479..56a46ced6e3 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -542,7 +542,7 @@ static void brw_emit_vertices(struct brw_context *brw) */ if (brw->vb.nr_enabled == 0) { BEGIN_BATCH(3); - OUT_BATCH((CMD_VERTEX_ELEMENT << 16) | 1); + OUT_BATCH((_3DSTATE_VERTEX_ELEMENTS << 16) | 1); if (intel->gen >= 6) { OUT_BATCH((0 << GEN6_VE0_INDEX_SHIFT) | GEN6_VE0_VALID | @@ -567,7 +567,7 @@ static void brw_emit_vertices(struct brw_context *brw) if (brw->vb.nr_buffers) { BEGIN_BATCH(1 + 4*brw->vb.nr_buffers); - OUT_BATCH((CMD_VERTEX_BUFFER << 16) | (4*brw->vb.nr_buffers - 1)); + OUT_BATCH((_3DSTATE_VERTEX_BUFFERS << 16) | (4*brw->vb.nr_buffers - 1)); for (i = 0; i < brw->vb.nr_buffers; i++) { struct brw_vertex_buffer *buffer = &brw->vb.buffers[i]; uint32_t dw0; @@ -598,7 +598,7 @@ static void brw_emit_vertices(struct brw_context *brw) } BEGIN_BATCH(1 + brw->vb.nr_enabled * 2); - OUT_BATCH((CMD_VERTEX_ELEMENT << 16) | (2*brw->vb.nr_enabled - 1)); + OUT_BATCH((_3DSTATE_VERTEX_ELEMENTS << 16) | (2*brw->vb.nr_enabled - 1)); for (i = 0; i < brw->vb.nr_enabled; i++) { struct brw_vertex_element *input = brw->vb.enabled[i]; uint32_t format = get_surface_type(input->glarray->Type, |