diff options
| author | Kristian Høgsberg <[email protected]> | 2010-04-26 09:53:23 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-04-28 14:05:19 -0400 |
| commit | 1904ba7936eb5a3fa76875a498eb54f3bd5f90a5 (patch) | |
| tree | b7ef799bb189a661c2061ff540ddda288f0c3536 | |
| parent | 87eb66775949af6e9512daf7e4665c1cfa6b8745 (diff) | |
mesa: Move drawtex functionality to main/
| -rw-r--r-- | src/mesa/es/sources.mak | 1 | ||||
| -rw-r--r-- | src/mesa/main/drawtex.c (renamed from src/mesa/es/main/drawtex.c) | 2 | ||||
| -rw-r--r-- | src/mesa/main/drawtex.h (renamed from src/mesa/es/main/drawtex.h) | 0 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak index fd3592cf2b6..6ddbcfdffc6 100644 --- 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 index 42f44093972..d24ca4ca5bb 100644 --- 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 index 0f3bac38c77..0f3bac38c77 100644 --- a/src/mesa/es/main/drawtex.h +++ b/src/mesa/main/drawtex.h diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 1dcaad1854e..2733a62d559 100644 --- 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 \ |