mesa: Move drawtex functionality to main/

diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index fd3592c..6ddbcfd 100644 (file)
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -3,7 +3,6 @@ include $(MESA)/sources.mak
 # LOCAL sources
 
 LOCAL_ES1_SOURCES :=                   \
-       main/drawtex.c                  \
        glapi/glapi-es1/main/enums.c
 
 LOCAL_ES1_GALLIUM_SOURCES :=           \

diff --git a/src/mesa/es/main/drawtex.c b/src/mesa/main/drawtex.c
similarity index 99%
rename from src/mesa/es/main/drawtex.c
rename to src/mesa/main/drawtex.c
index 42f4409..d24ca4c 100644 (file)
--- a/src/mesa/es/main/drawtex.c
+++ b/src/mesa/main/drawtex.c
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "drawtex.h"
+#include "main/drawtex.h"
 #include "main/state.h"
 #include "main/imports.h"
 

diff --git a/src/mesa/es/main/drawtex.h b/src/mesa/main/drawtex.h
similarity index 100%
rename from src/mesa/es/main/drawtex.h
rename to src/mesa/main/drawtex.h

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 1dcaad1..2733a62 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -27,6 +27,7 @@ MAIN_SOURCES = \
        main/dlist.c \
        main/dlopen.c \
        main/drawpix.c \
+       main/drawtex.c \
        main/enable.c \
        main/enums.c \
        main/eval.c \