Mesa (master): r600g: define GROUP_FORCE_NEW_BLOCK in common header

Marek Olšák mareko at kemper.freedesktop.org
Thu Feb 23 20:52:56 UTC 2012


Module: Mesa
Branch: master
Commit: f841b8a833f32074c79724c66c85cdc7b48087e2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f841b8a833f32074c79724c66c85cdc7b48087e2

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Feb 21 17:49:29 2012 +0100

r600g: define GROUP_FORCE_NEW_BLOCK in common header

Reviewed-by: Jerome Glisse <jglisse at redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/gallium/drivers/r600/evergreen_hw_context.c |    2 --
 src/gallium/drivers/r600/r600_hw_context.c      |    2 --
 src/gallium/drivers/r600/r600_hw_context_priv.h |    2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 71edc26..308224b 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -30,8 +30,6 @@
 #include "util/u_memory.h"
 #include <errno.h>
 
-#define GROUP_FORCE_NEW_BLOCK	0
-
 static const struct r600_reg evergreen_config_reg_list[] = {
 	{R_008958_VGT_PRIMITIVE_TYPE, 0},
 };
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index 56a83ae..40a8519 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -29,8 +29,6 @@
 #include "util/u_memory.h"
 #include <errno.h>
 
-#define GROUP_FORCE_NEW_BLOCK	0
-
 /* Get backends mask */
 void r600_get_backend_mask(struct r600_context *ctx)
 {
diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h
index 61009af..c32fc63 100644
--- a/src/gallium/drivers/r600/r600_hw_context_priv.h
+++ b/src/gallium/drivers/r600/r600_hw_context_priv.h
@@ -44,6 +44,8 @@
 #define BLOCK_FLAG_RESOURCE 32
 #define REG_FLAG_FLUSH_CHANGE 64
 
+#define GROUP_FORCE_NEW_BLOCK	0
+
 struct r600_reg {
 	unsigned			offset;
 	unsigned			flags;




More information about the mesa-commit mailing list