summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2010-04-24 20:36:49 -0400
committerKristian Høgsberg <[email protected]>2010-04-28 14:05:19 -0400
commit87eb66775949af6e9512daf7e4665c1cfa6b8745 (patch)
tree3e54eceedc314ea6d95263a324224d8283ff58b7 /src/mesa
parenta73eff645f5203165bf63996a1d60fcab5a6b85e (diff)
mesa: Move glQueryMatrixxOES() implementation to core mesa
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/es/sources.mak1
-rw-r--r--src/mesa/main/querymatrix.c (renamed from src/mesa/es/main/es_query_matrix.c)0
-rw-r--r--src/mesa/sources.mak1
3 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index d01603a1c40..fd3592cf2b6 100644
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -4,7 +4,6 @@ include $(MESA)/sources.mak
LOCAL_ES1_SOURCES := \
main/drawtex.c \
- main/es_query_matrix.c \
glapi/glapi-es1/main/enums.c
LOCAL_ES1_GALLIUM_SOURCES := \
diff --git a/src/mesa/es/main/es_query_matrix.c b/src/mesa/main/querymatrix.c
index 82b6fe7ab9f..82b6fe7ab9f 100644
--- a/src/mesa/es/main/es_query_matrix.c
+++ b/src/mesa/main/querymatrix.c
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 5e11192b44e..1dcaad1854e 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -58,6 +58,7 @@ MAIN_SOURCES = \
main/points.c \
main/polygon.c \
main/queryobj.c \
+ main/querymatrix.c \
main/rastpos.c \
main/rbadaptors.c \
main/readpix.c \