diff options
-rw-r--r-- | Android.mk | 15 | ||||
-rw-r--r-- | src/gallium/Android.mk | 9 | ||||
-rw-r--r-- | src/gallium/drivers/r300/Android.mk | 46 | ||||
-rw-r--r-- | src/gallium/targets/egl-static/Android.mk | 3 |
4 files changed, 67 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 02ce3f1609b..ea6f101362d 100644 --- a/Android.mk +++ b/Android.mk @@ -24,7 +24,7 @@ # BOARD_GPU_DRIVERS should be defined. The valid values are # # classic drivers: -# gallium drivers: swrast i915g r600g vmwgfx +# gallium drivers: swrast i915g r300g r600g vmwgfx # # The main target is libGLES_mesa. There is no classic drivers yet. @@ -36,7 +36,7 @@ DRM_TOP := external/drm DRM_GRALLOC_TOP := hardware/drm_gralloc classic_drivers := -gallium_drivers := swrast i915g r600g vmwgfx +gallium_drivers := swrast i915g r300g r600g vmwgfx MESA_GPU_DRIVERS := $(BOARD_GPU_DRIVERS) @@ -116,11 +116,16 @@ gallium_DRIVERS += libmesa_winsys_i915 libmesa_pipe_i915 LOCAL_SHARED_LIBRARIES += libdrm_intel endif -# r600g -ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) +# r300g/r600g +ifneq ($(filter r300g r600g, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_winsys_radeon +ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),) +gallium_DRIVERS += libmesa_pipe_r300 +endif +ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_pipe_r600 libmesa_winsys_r600 endif +endif # vmwgfx ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),) @@ -131,6 +136,8 @@ endif # Notes about the order here: # # * libmesa_st_egl depends on libmesa_winsys_sw_android in $(gallium_DRIVERS) +# * libmesa_pipe_r300 in $(gallium_DRIVERS) depends on libmesa_st_mesa and +# libmesa_glsl # * libmesa_st_mesa depends on libmesa_glsl # * libmesa_glsl depends on libmesa_glsl_utils # diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index 4d303d81e6e..a39427388f9 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -39,11 +39,16 @@ ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/i915/drm drivers/i915 endif -# r600g -ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) +# r300g/r600g +ifneq ($(filter r300g r600g, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/radeon/drm +ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),) +SUBDIRS += drivers/r300 +endif +ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/r600/drm drivers/r600 endif +endif # vmwgfx ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),) diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk new file mode 100644 index 00000000000..fe3c2bd2611 --- /dev/null +++ b/src/gallium/drivers/r300/Android.mk @@ -0,0 +1,46 @@ +# Mesa 3-D graphics library +# +# Copyright (C) 2011 Chia-I Wu <[email protected]> +# Copyright (C) 2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +# get C_SOURCES +include $(LOCAL_PATH)/Makefile.sources + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(C_SOURCES) + +LOCAL_CFLAGS := -std=c99 + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/glsl \ + $(MESA_TOP)/src/mesa \ + $(DRM_TOP) \ + $(DRM_TOP)/include/drm + +LOCAL_MODULE := libmesa_pipe_r300 + +include $(GALLIUM_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + diff --git a/src/gallium/targets/egl-static/Android.mk b/src/gallium/targets/egl-static/Android.mk index a6b026c8869..c34693a8758 100644 --- a/src/gallium/targets/egl-static/Android.mk +++ b/src/gallium/targets/egl-static/Android.mk @@ -49,6 +49,9 @@ LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),) LOCAL_CFLAGS += -D_EGL_PIPE_I915=1 endif +ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),) +LOCAL_CFLAGS += -D_EGL_PIPE_R300=1 +endif ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) LOCAL_CFLAGS += -D_EGL_PIPE_R600=1 endif |