Merge branch 'gles2-2'

Conflicts:
	src/mesa/drivers/dri/common/dri_util.h

1 files changed, 4 insertions, 45 deletions

diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index 55bb31b80dd..9bb7a6ff38c 100644
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -1,45 +1,13 @@
 include $(MESA)/sources.mak
 
-# LOCAL sources
-
-LOCAL_ES1_SOURCES :=			\
-	main/api_exec_es1.c		\
-	main/get_es1.c			\
-	main/specials_es1.c		\
-	main/drawtex.c			\
-	main/es_cpaltex.c		\
-	main/es_enable.c		\
-	main/es_fbo.c			\
-	main/es_query_matrix.c		\
-	main/es_texgen.c		\
-	main/stubs.c			\
-	glapi/glapi-es1/main/enums.c
-
-LOCAL_ES1_GALLIUM_SOURCES :=		\
-	$(LOCAL_ES1_SOURCES)		\
-	state_tracker/st_cb_drawtex.c
-
 # always use local version of GLAPI_ASM_SOURCES
 LOCAL_ES1_API_ASM := $(addprefix glapi/glapi-es1/, $(GLAPI_ASM_SOURCES))
 
 LOCAL_ES1_INCLUDES :=			\
 	-I.				\
 	-I./glapi/glapi-es1		\
-	-I./state_tracker		\
 	-I$(MESA)/state_tracker
 
-LOCAL_ES2_SOURCES :=			\
-	main/api_exec_es2.c		\
-	main/get_es2.c			\
-	main/specials_es2.c		\
-	main/es_cpaltex.c		\
-	main/es_fbo.c			\
-	main/stubs.c			\
-	glapi/glapi-es2/main/enums.c
-
-LOCAL_ES2_GALLIUM_SOURCES :=		\
-	$(LOCAL_ES2_SOURCES)
-
 LOCAL_ES2_API_ASM := $(subst es1,es2, $(LOCAL_ES1_API_ASM))
 LOCAL_ES2_INCLUDES := $(subst es1,es2, $(LOCAL_ES1_INCLUDES))
 
@@ -50,7 +18,6 @@ MAIN_OMITTED :=				\
 	main/api_exec.c			\
 	main/condrender.c		\
 	main/dlopen.c			\
-	main/enums.c			\
 	main/get.c
 MAIN_SOURCES := $(filter-out $(MAIN_OMITTED), $(MAIN_SOURCES))
 
@@ -101,10 +68,6 @@ MESA_ES1_API_SOURCES :=			\
 
 MESA_ES1_INCLUDES := $(INCLUDE_DIRS)
 
-# remove LOCAL sources from MESA sources
-MESA_ES1_SOURCES := $(filter-out $(LOCAL_ES1_SOURCES), $(MESA_ES1_SOURCES))
-MESA_ES1_GALLIUM_SOURCES := $(filter-out $(LOCAL_ES1_GALLIUM_SOURCES), $(MESA_ES1_GALLIUM_SOURCES))
-
 # right now es2 and es1 share MESA sources
 MESA_ES2_SOURCES := $(MESA_ES1_SOURCES)
 MESA_ES2_GALLIUM_SOURCES := $(MESA_ES1_GALLIUM_SOURCES)
@@ -116,12 +79,12 @@ MESA_ES2_INCLUDES := $(MESA_ES1_INCLUDES)
 MESA_ES_ASM := $(MESA_ASM_SOURCES)
 
 # collect sources, adjust the pathes
-ES1_SOURCES := $(LOCAL_ES1_SOURCES) $(addprefix $(MESA)/,$(MESA_ES1_SOURCES))
-ES1_GALLIUM_SOURCES := $(LOCAL_ES1_GALLIUM_SOURCES) $(addprefix $(MESA)/,$(MESA_ES1_GALLIUM_SOURCES))
+ES1_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_SOURCES))
+ES1_GALLIUM_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_GALLIUM_SOURCES))
 ES1_API_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_API_SOURCES))
 
-ES2_SOURCES := $(LOCAL_ES2_SOURCES) $(addprefix $(MESA)/,$(MESA_ES2_SOURCES))
-ES2_GALLIUM_SOURCES := $(LOCAL_ES2_GALLIUM_SOURCES) $(addprefix $(MESA)/,$(MESA_ES2_GALLIUM_SOURCES))
+ES2_SOURCES := $(addprefix $(MESA)/,$(MESA_ES2_SOURCES))
+ES2_GALLIUM_SOURCES := $(addprefix $(MESA)/,$(MESA_ES2_GALLIUM_SOURCES))
 ES2_API_SOURCES := $(addprefix $(MESA)/,$(MESA_ES2_API_SOURCES))
 
 # collect includes
@@ -130,12 +93,10 @@ ES2_INCLUDES := $(LOCAL_ES2_INCLUDES) $(MESA_ES2_INCLUDES)
 
 # collect objects, including asm
 ES1_OBJECTS :=					\
-	$(LOCAL_ES1_SOURCES:.c=.o)		\
 	$(MESA_ES1_SOURCES:.c=.o)		\
 	$(MESA_ES_ASM:.S=.o)
 
 ES1_GALLIUM_OBJECTS :=				\
-	$(LOCAL_ES1_GALLIUM_SOURCES:.c=.o)	\
 	$(MESA_ES1_GALLIUM_SOURCES:.c=.o)	\
 	$(MESA_ES_ASM:.S=.o)
 
@@ -144,12 +105,10 @@ ES1_API_OBJECTS :=				\
 	$(MESA_ES1_API_SOURCES:.c=.o)
 
 ES2_OBJECTS :=					\
-	$(LOCAL_ES2_SOURCES:.c=.o)		\
 	$(MESA_ES2_SOURCES:.c=.o)		\
 	$(MESA_ES_ASM:.S=.o)
 
 ES2_GALLIUM_OBJECTS :=				\
-	$(LOCAL_ES2_GALLIUM_SOURCES:.c=.o)	\
 	$(MESA_ES2_GALLIUM_SOURCES:.c=.o)	\
 	$(MESA_ES_ASM:.S=.o)