diff options
| author | Kenneth Graunke <[email protected]> | 2012-04-18 18:25:01 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-04-18 18:28:31 -0700 |
| commit | 4f96e9830fa316fd1dacd6068c1f0e79a56ba038 (patch) | |
| tree | a0b81d25224a8aaa4dd4756e919620e6dea6054d | |
| parent | 5177f6b1b99a68daf50e47dc420c0057fa5e8980 (diff) | |
i965: Rename BRW_MAX_SURFACES to BRW_MAX_WM_SURFACES.
Now that we use separate binding tables for WM, VS, and GS, and have
BRW_MAX_VS_SURFACES and BRW_MAX_GS_SURFACES macros, we really shouldn't
have an unqualified BRW_MAX_SURFACES macro. It's confusing.
Signed-off-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 6df5b165f90..47f56e21f5d 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -517,7 +517,7 @@ struct brw_vs_ouput_sizes { #define SURF_INDEX_TEXTURE(t) (BRW_MAX_DRAW_BUFFERS + 2 + (t)) /** Maximum size of the binding table. */ -#define BRW_MAX_SURFACES SURF_INDEX_TEXTURE(BRW_MAX_TEX_UNIT) +#define BRW_MAX_WM_SURFACES SURF_INDEX_TEXTURE(BRW_MAX_TEX_UNIT) #define SURF_INDEX_VERT_CONST_BUFFER (0) #define SURF_INDEX_VS_TEXTURE(t) (SURF_INDEX_VERT_CONST_BUFFER + 1 + (t)) @@ -932,7 +932,7 @@ struct brw_context /** Binding table of pointers to surf_bo entries */ uint32_t bind_bo_offset; - uint32_t surf_offset[BRW_MAX_SURFACES]; + uint32_t surf_offset[BRW_MAX_WM_SURFACES]; /** @{ register allocator */ diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 6652ffc1293..69af0eecee1 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -1125,11 +1125,11 @@ brw_upload_wm_binding_table(struct brw_context *brw) * space for the binding table. */ bind = brw_state_batch(brw, AUB_TRACE_BINDING_TABLE, - sizeof(uint32_t) * BRW_MAX_SURFACES, + sizeof(uint32_t) * BRW_MAX_WM_SURFACES, 32, &brw->wm.bind_bo_offset); /* BRW_NEW_SURFACES */ - for (i = 0; i < BRW_MAX_SURFACES; i++) { + for (i = 0; i < BRW_MAX_WM_SURFACES; i++) { bind[i] = brw->wm.surf_offset[i]; } |