4 files changed, 2 insertions, 11 deletions
diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index 96199d6396..9bb7a6ff38 100644
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -1,17 +1,11 @@
 include $(MESA)/sources.mak
 
-# LOCAL sources
-
-LOCAL_ES1_GALLIUM_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_API_ASM := $(subst es1,es2, $(LOCAL_ES1_API_ASM))
@@ -74,9 +68,6 @@ MESA_ES1_API_SOURCES :=			\
 
 MESA_ES1_INCLUDES := $(INCLUDE_DIRS)
 
-# remove LOCAL sources from MESA 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)
@@ -89,7 +80,7 @@ MESA_ES_ASM := $(MESA_ASM_SOURCES)
 
 # collect sources, adjust the pathes
 ES1_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_SOURCES))
-ES1_GALLIUM_SOURCES := $(LOCAL_ES1_GALLIUM_SOURCES) $(addprefix $(MESA)/,$(MESA_ES1_GALLIUM_SOURCES))
+ES1_GALLIUM_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_GALLIUM_SOURCES))
 ES1_API_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_API_SOURCES))
 
 ES2_SOURCES := $(addprefix $(MESA)/,$(MESA_ES2_SOURCES))
@@ -106,7 +97,6 @@ ES1_OBJECTS :=					\
 	$(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)
 
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 2733a62d55..3b2dcad885 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -206,6 +206,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_condrender.c \
 	state_tracker/st_cb_flush.c \
 	state_tracker/st_cb_drawpixels.c \
+	state_tracker/st_cb_drawtex.c \
 	state_tracker/st_cb_eglimage.c \
 	state_tracker/st_cb_fbo.c \
 	state_tracker/st_cb_feedback.c \
diff --git a/src/mesa/es/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c
index 6d387d5ccf..6d387d5ccf 100644
--- a/src/mesa/es/state_tracker/st_cb_drawtex.c
+++ b/src/mesa/state_tracker/st_cb_drawtex.c
diff --git a/src/mesa/es/state_tracker/st_cb_drawtex.h b/src/mesa/state_tracker/st_cb_drawtex.h
index 7b0da70279..7b0da70279 100644
--- a/src/mesa/es/state_tracker/st_cb_drawtex.h
+++ b/src/mesa/state_tracker/st_cb_drawtex.h