Mesa (mesa_7_6_branch): r600: move structs for legacy cmdbuf into cmdbuf C file.

Dave Airlie airlied at kemper.freedesktop.org
Mon Dec 21 16:25:38 PST 2009


Module: Mesa
Branch: mesa_7_6_branch
Commit: 1703628011242a9f1c664e67eabe8d4370a39b31
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1703628011242a9f1c664e67eabe8d4370a39b31

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Dec 17 14:23:08 2009 +1000

r600: move structs for legacy cmdbuf into cmdbuf C file.

these really shouldn't be exposed here

---

 src/mesa/drivers/dri/r600/r600_cmdbuf.c |   15 +++++++++++++++
 src/mesa/drivers/dri/r600/r600_cmdbuf.h |   16 ----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
index d27a324..5e15048 100644
--- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c
+++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
@@ -52,6 +52,21 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_mipmap_tree.h"
 #include "radeon_reg.h"
 
+struct r600_cs_manager_legacy
+{
+    struct radeon_cs_manager    base;
+    struct radeon_context       *ctx;
+    /* hack for scratch stuff */
+    uint32_t                    pending_age;
+    uint32_t                    pending_count;
+};
+
+struct r600_cs_reloc_legacy {
+    struct radeon_cs_reloc  base;
+    uint32_t                cindices;
+    uint32_t                *indices;
+    uint32_t                *reloc_indices;
+};
 
 
 static struct radeon_cs * r600_cs_create(struct radeon_cs_manager *csm,
diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.h b/src/mesa/drivers/dri/r600/r600_cmdbuf.h
index eba43d3..dff0009 100644
--- a/src/mesa/drivers/dri/r600/r600_cmdbuf.h
+++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.h
@@ -118,22 +118,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R600_IT_SET_CTL_CONST                     0x00006F00
 #define R600_IT_SURFACE_BASE_UPDATE               0x00007300
 
-struct r600_cs_manager_legacy
-{
-    struct radeon_cs_manager    base;
-    struct radeon_context       *ctx;
-    /* hack for scratch stuff */
-    uint32_t                    pending_age;
-    uint32_t                    pending_count;
-};
-
-struct r600_cs_reloc_legacy {
-    struct radeon_cs_reloc  base;
-    uint32_t                cindices;
-    uint32_t                *indices;
-    uint32_t                *reloc_indices;
-};
-
 struct radeon_cs_manager * r600_radeon_cs_manager_legacy_ctor(struct radeon_context *ctx);
 
 /**



More information about the mesa-commit mailing list