st/nine: sm1_declusage_to_tgsi, do not restrict indices with TGSI_SEMANTIC_GENERIC

[mesa.git] / src / gallium / targets / egl-static / Android.mk

diff --git a/src/gallium/targets/egl-static/Android.mk b/src/gallium/targets/egl-static/Android.mk
index 8bdbeda61f4a89973f779d2b40c6704906051556..adaf582e15eb0664c8ff1f706aa8783441016e9c 100644 (file)
--- a/src/gallium/targets/egl-static/Android.mk
+++ b/src/gallium/targets/egl-static/Android.mk
@@ -39,27 +39,40 @@ LOCAL_C_INCLUDES := \
        $(GALLIUM_TOP)/state_trackers/vega \
        $(GALLIUM_TOP)/state_trackers/egl \
        $(MESA_TOP)/src/egl/main \
-       $(MESA_TOP)/src/mesa \
-       $(DRM_TOP)/include/drm \
-       $(DRM_TOP)
+       $(MESA_TOP)/src/loader \
+       $(MESA_TOP)/src/mesa
 
 # swrast
 LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE
 
+# !swrast only
+ifneq ($(MESA_GPU_DRIVERS),swrast)
+LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
+endif
+
+ifneq ($(filter freedreno, $(MESA_GPU_DRIVERS)),)
+LOCAL_CFLAGS += -DGALLIUM_FREEDRENO
+endif
 ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -D_EGL_PIPE_I915=1
+LOCAL_CFLAGS += -DGALLIUM_I915
+endif
+ifneq ($(filter ilo, $(MESA_GPU_DRIVERS)),)
+LOCAL_CFLAGS += -DGALLIUM_ILO
 endif
 ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -D_EGL_PIPE_NOUVEAU=1
+LOCAL_CFLAGS += -DGALLIUM_NOUVEAU
 endif
 ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -D_EGL_PIPE_R300=1
+LOCAL_CFLAGS += -DGALLIUM_R300
 endif
 ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -D_EGL_PIPE_R600=1
+LOCAL_CFLAGS += -DGALLIUM_R600
+endif
+ifneq ($(filter radeonsi, $(MESA_GPU_DRIVERS)),)
+LOCAL_CFLAGS += -DGALLIUM_RADEONSI
 endif
 ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -D_EGL_PIPE_VMWGFX=1
+LOCAL_CFLAGS += -DGALLIUM_VMWGFX
 endif
 
 LOCAL_MODULE := libmesa_egl_gallium