diff options
Diffstat (limited to 'src/gallium')
-rwxr-xr-x | src/gallium/drivers/r300/Android.mk | 4 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/android/native_android.cpp | 4 | ||||
-rw-r--r-- | src/gallium/targets/Android.mk | 17 | ||||
-rwxr-xr-x | src/gallium/winsys/radeon/Android.mk | 4 |
4 files changed, 17 insertions, 12 deletions
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk index acb9a87b83..779ba673a5 100755 --- a/src/gallium/drivers/r300/Android.mk +++ b/src/gallium/drivers/r300/Android.mk @@ -1,4 +1,4 @@ -ifeq ($(strip $(MESA_BUILD_R600G)),true) +ifeq ($(strip $(MESA_BUILD_R300)),true) LOCAL_PATH := $(call my-dir) @@ -50,4 +50,4 @@ LOCAL_MODULE := libmesa_pipe_r300 include $(BUILD_STATIC_LIBRARY) -endif # MESA_BUILD_R600G +endif # MESA_BUILD_R300 diff --git a/src/gallium/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp index 7687ec86a6..a584d54db4 100644 --- a/src/gallium/state_trackers/egl/android/native_android.cpp +++ b/src/gallium/state_trackers/egl/android/native_android.cpp @@ -413,11 +413,7 @@ android_display_create_window_surface(struct native_display *ndpy, asurf = CALLOC_STRUCT(android_surface); if (!asurf) - { - LOGE("Can't allocate android surface structure... X_x "); return NULL; - } - LOGI("Android surface struct allocated :)"); asurf->adpy = adpy; asurf->win = win; diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk index 55cd354a5d..ea35abf4e8 100644 --- a/src/gallium/targets/Android.mk +++ b/src/gallium/targets/Android.mk @@ -66,11 +66,9 @@ LOCAL_SHARED_LIBRARIES += \ libdrm_intel endif # MESA_BUILD_I915G -ifeq ($(strip $(MESA_BUILD_R600G)),true) -LOCAL_CFLAGS += -D_EGL_PIPE_R600 -D_EGL_PIPE_R300 +ifeq ($(strip $(MESA_BUILD_R300)),true) +LOCAL_CFLAGS += -D_EGL_PIPE_R300 LOCAL_STATIC_LIBRARIES := \ - libmesa_pipe_r600 \ - libmesa_winsys_r600 \ libmesa_pipe_r300 \ libmesa_winsys_r300 \ libr300_dri \ @@ -78,6 +76,17 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES += \ libdrm \ libdrm_radeon +endif # MESA_BUILD_R300 + +ifeq ($(strip $(MESA_BUILD_R600G)),true) +LOCAL_CFLAGS += -D_EGL_PIPE_R600 +LOCAL_STATIC_LIBRARIES := \ + libmesa_pipe_r600 \ + libmesa_winsys_r600 \ + $(LOCAL_STATIC_LIBRARIES) +LOCAL_SHARED_LIBRARIES += \ + libdrm \ + libdrm_radeon endif # MESA_BUILD_R600G LOCAL_MODULE := libGLES_mesa 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 |