radeon/r200/r300: make build again with tracker changes

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index c9f907ec5bae25e5e874041f4a0ffed568f262a2..41c7aed3655fa66e56958d0015b382a1a54b6372 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -14,6 +14,7 @@ endif
 RADEON_COMMON_SOURCES = \
        radeon_texture.c \
        radeon_common_context.c \
+       radeon_common.c \
        radeon_dma.c \
        radeon_lock.c \
        radeon_bo_legacy.c \

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 1b690feeeeed84b0a64929caa9f4ad01fd1bfdbe..b3c58cf6f65a1d0a2fb10b1113130339f9030af6 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -23,6 +23,7 @@ COMMON_SOURCES = \
 RADEON_COMMON_SOURCES = \
        radeon_texture.c \
        radeon_common_context.c \
+       radeon_common.c \
        radeon_dma.c \
        radeon_lock.c \
        radeon_bo_legacy.c \

diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index 9eb078ed8d10c3f8cbdb39d6800e0f74bfc3d48f..0a5775b11c1a9efca2e9a34600123361ec958c4f 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -11,6 +11,7 @@ MINIGLX_SOURCES = server/radeon_dri.c
 RADEON_COMMON_SOURCES = \
        radeon_texture.c \
        radeon_common_context.c \
+       radeon_common.c \
        radeon_dma.c \
        radeon_lock.c \
        radeon_bo_legacy.c \

diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_drm.h b/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
index 3cabdfc4e8141e6155dd66bf34def547cad66147..1ed13f17955d27f4cb62034f06a23d40df7d0048 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include "radeon_track.h"
+//#include "radeon_track.h"
 
 /* bo object */
 #define RADEON_BO_FLAGS_MACRO_TILE  1
@@ -73,7 +73,10 @@ struct radeon_bo_funcs {
 struct radeon_bo_manager {
     struct radeon_bo_funcs  *funcs;
     int                     fd;
+
+#ifdef RADEON_BO_TRACK
     struct radeon_tracker   tracker;
+#endif
 };
     
 static inline void _radeon_bo_debug(struct radeon_bo *bo,

diff --git a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
index 36dea3be7bdc1c62bee4ff92dda7930aedb5cbcf..b86f31f88a548bd6d0f35a23f61e9214d19928eb 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
@@ -26,7 +26,18 @@ static inline void radeon_bo_manager_gem_dtor(void *dummy)
 {
 }
 
+static inline void *radeon_cs_manager_gem_ctor(int fd)
+{
+  return NULL;
+}
+
+static inline void radeon_cs_manager_gem_dtor(void *dummy)
+{
+}
 
+static inline void radeon_tracker_print(void *ptr, int io)
+{
+}
 #endif
 
 #include "radeon_bo_legacy.h"

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 80e8e0d86d4da69b0f29e46480aaea1384b721ed..f5f433b2adbd649618708e5c964ef14f77c7b84a 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -64,6 +64,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "radeon_common.h"
 #include "radeon_bocs_wrapper.h"
+#include "radeon_lock.h"
 #include "radeon_drm.h"
 #include "radeon_mipmap_tree.h"
 

diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 8acde2b90cd892de29ac9dbcc6bffbfb48eddc8d..1b8a05d045bbc944f4c28c2974f6a4f33e626a2d 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -37,6 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "utils.h"
 #include "drirenderbuffer.h"
 #include "vblank.h"
+#include "main/state.h"
 
 #define DRIVER_DATE "20090101"
 
@@ -175,7 +176,9 @@ GLboolean radeonInitContext(radeonContextPtr radeon,
  */
 void radeonCleanupContext(radeonContextPtr radeon)
 {
+#ifdef RADEON_BO_TRACK
        FILE *track;
+#endif
        struct radeon_renderbuffer *rb;
        GLframebuffer *fb;
 
@@ -232,11 +235,13 @@ void radeonCleanupContext(radeonContextPtr radeon)
                FREE(radeon->state.scissor.pClipRects);
                radeon->state.scissor.pClipRects = 0;
        }
+#ifdef RADEON_BO_TRACK
        track = fopen("/tmp/tracklog", "w");
        if (track) {
                radeon_tracker_print(&radeon->radeonScreen->bom->tracker, track);
                fclose(track);
        }
+#endif
 }
 
 /* Force the context `c' to be unbound from its buffer.

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index e8cc3b25a8c925009b7009350346227017ce7ce5..8b06fb4d3e9baff44eff068f01cd7c843b5ff1dc 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1115,7 +1115,9 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
         return;
 
     if (screen->kernel_mm) {
+#ifdef RADEON_BO_TRACK
         radeon_tracker_print(&screen->bom->tracker, stderr);
+#endif
         radeon_bo_manager_gem_dtor(screen->bom);
     } else {
         radeon_bo_manager_legacy_dtor(screen->bom);