r600g: use modulo for computing index into query (ring) buffers

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 2ad83a08563bfb2693a6d767501c4b216b78b2ab..0c07d5e02d1afe36def1081a464b77785295bf2a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -23,7 +23,7 @@
 
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
-#   classic drivers:
+#   classic drivers: i915 i965
 #   gallium drivers: swrast i915g nouveau r300g r600g vmwgfx
 #
 # The main target is libGLES_mesa.  For each classic driver enabled, a DRI
@@ -36,7 +36,7 @@ MESA_PYTHON2 := python
 DRM_TOP := external/drm
 DRM_GRALLOC_TOP := hardware/drm_gralloc
 
-classic_drivers :=
+classic_drivers := i915 i965
 gallium_drivers := swrast i915g nouveau r300g r600g vmwgfx
 
 MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
@@ -135,9 +135,9 @@ endif
 ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
 gallium_DRIVERS += \
        libmesa_winsys_nouveau \
-       libmesa_pipe_nvc0 \
-       libmesa_pipe_nv50 \
        libmesa_pipe_nvfx \
+       libmesa_pipe_nv50 \
+       libmesa_pipe_nvc0 \
        libmesa_pipe_nouveau
 LOCAL_SHARED_LIBRARIES += libdrm_nouveau
 endif
@@ -149,7 +149,7 @@ 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
+gallium_DRIVERS += libmesa_pipe_r600
 endif
 endif