diff options
Diffstat (limited to 'src/gallium/winsys')
| -rwxr-xr-x | src/gallium/winsys/radeon/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/winsys/radeon/Android.mk b/src/gallium/winsys/radeon/Android.mk index 2726ddde8c..6e6d157624 100755 --- a/src/gallium/winsys/radeon/Android.mk +++ b/src/gallium/winsys/radeon/Android.mk @@ -1,4 +1,4 @@ -ifeq ($(strip $(MESA_BUILD_R600G)),true) +ifeq ($(strip $(MESA_BUILD_R300)),true) LOCAL_PATH := $(call my-dir) @@ -30,4 +30,4 @@ LOCAL_MODULE := libmesa_winsys_r300 include $(BUILD_STATIC_LIBRARY) -endif # MESA_BUILD_R600G +endif # MESA_BUILD_R300 diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index fa20d7eb98..b582cf44d1 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -39,6 +39,10 @@ #include <xf86drm.h> #include <errno.h> +#define RADEON_BO_FLAGS_MACRO_TILE 1 +#define RADEON_BO_FLAGS_MICRO_TILE 2 +#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20 + #ifdef ANDROID extern void* __mmap2(void*, size_t, int, int, int, size_t); @@ -58,11 +62,6 @@ static void* android_mmap2(void *addr, size_t size, int prot, int flags, int fd, #endif /* ANDROID */ - -#define RADEON_BO_FLAGS_MACRO_TILE 1 -#define RADEON_BO_FLAGS_MICRO_TILE 2 -#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20 - extern const struct pb_vtbl radeon_bo_vtbl; |