Mesa (master): i965: Rename BRW_MAX_SURFACES to BRW_MAX_WM_SURFACES.
Kenneth Graunke
kwg at kemper.freedesktop.org
Thu Apr 19 01:28:51 UTC 2012
Module: Mesa
Branch: master
Commit: 4f96e9830fa316fd1dacd6068c1f0e79a56ba038
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f96e9830fa316fd1dacd6068c1f0e79a56ba038
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Apr 18 18:25:01 2012 -0700
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 <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_context.h | 4 ++--
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 6df5b16..47f56e2 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 6652ffc..69af0ee 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];
}
More information about the mesa-commit
mailing list