glapi: Move assembly dispatchers back into glapi/.

8 files changed, 20 insertions, 20 deletions

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 7294cf9a32b..9cc5d493111 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -291,7 +291,7 @@ if env['platform'] != 'winddk':
 			'x86/read_rgba_span_x86.S',
 		]
 		glapi_sources += [
-			'x86/glapi_x86.S',
+			'glapi/glapi_x86.S',
 		]
 	elif gcc and env['machine'] == 'x86_64':
 		env.Append(CPPDEFINES = [
@@ -302,7 +302,7 @@ if env['platform'] != 'winddk':
 			'x86-64/xform4.S',
 		]
 		glapi_sources += [
-			'x86-64/glapi_x86-64.S'
+			'glapi/glapi_x86-64.S'
 		]
 	elif gcc and env['machine'] == 'ppc':
 		env.Append(CPPDEFINES = [
@@ -322,7 +322,7 @@ if env['platform'] != 'winddk':
 			'sparc/xform.S',
 		]
 		glapi_sources += [
-			'sparc/glapi_sparc.S'
+			'glapi/glapi_sparc.S'
 		]
 	else:
 		pass
diff --git a/src/mesa/es/glapi/Makefile b/src/mesa/es/glapi/Makefile
index fea55594fda..d12b8a5507b 100644
--- a/src/mesa/es/glapi/Makefile
+++ b/src/mesa/es/glapi/Makefile
@@ -8,9 +8,9 @@ OUTPUTS :=			\
 	glapi/glapitable.h	\
 	glapi/glapitemp.h	\
 	glapi/glprocs.h		\
-	sparc/glapi_sparc.S	\
-	x86-64/glapi_x86-64.S	\
-	x86/glapi_x86.S		\
+	glapi/glapi_sparc.S	\
+	glapi/glapi_x86-64.S	\
+	glapi/glapi_x86.S	\
 	main/remap_helper.h
 
 COMMON = gl_XML.py glX_XML.py license.py typeexpr.py
@@ -59,13 +59,13 @@ endef
 %/glprocs.h: $(GLAPI)/gl_procs.py $(COMMON)
 	$(call gen-glapi,-c)
 
-%/sparc/glapi_sparc.S: $(GLAPI)/gl_SPARC_asm.py $(COMMON)
+%/glapi_sparc.S: $(GLAPI)/gl_SPARC_asm.py $(COMMON)
 	$(call gen-glapi)
 
-%/x86-64/glapi_x86-64.S: $(GLAPI)/gl_x86-64_asm.py $(COMMON)
+%/glapi_x86-64.S: $(GLAPI)/gl_x86-64_asm.py $(COMMON)
 	$(call gen-glapi)
 
-%/x86/glapi_x86.S: $(GLAPI)/gl_x86_asm.py $(COMMON)
+%/glapi_x86.S: $(GLAPI)/gl_x86_asm.py $(COMMON)
 	$(call gen-glapi)
 
 %/main/remap_helper.h: $(GLAPI)/remap_helper.py $(COMMON)
diff --git a/src/mesa/glapi/gen/Makefile b/src/mesa/glapi/gen/Makefile
index 10998b2ce23..289ffbde01d 100644
--- a/src/mesa/glapi/gen/Makefile
+++ b/src/mesa/glapi/gen/Makefile
@@ -19,9 +19,9 @@ MESA_GLAPI_OUTPUTS = \
 	$(MESA_GLAPI_DIR)/glapidispatch.h
 
 MESA_GLAPI_ASM_OUTPUTS = \
-	$(MESA_DIR)/x86/glapi_x86.S \
-	$(MESA_DIR)/x86-64/glapi_x86-64.S \
-	$(MESA_DIR)/sparc/glapi_sparc.S
+	$(MESA_GLAPI_DIR)/glapi_x86.S \
+	$(MESA_GLAPI_DIR)/glapi_x86-64.S \
+	$(MESA_GLAPI_DIR)/glapi_sparc.S
 
 MESA_OUTPUTS = \
 	$(MESA_GLAPI_OUTPUTS) \
@@ -140,13 +140,13 @@ $(MESA_GLAPI_DIR)/glapidispatch.h: gl_table.py $(COMMON)
 
 ######################################################################
 
-$(MESA_DIR)/x86/glapi_x86.S: gl_x86_asm.py $(COMMON)
+$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
 	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-$(MESA_DIR)/x86-64/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
+$(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
 	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-$(MESA_DIR)/sparc/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
+$(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
 	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
 ######################################################################
diff --git a/src/mesa/glapi/glapi_dispatch.c b/src/mesa/glapi/glapi_dispatch.c
index 32b9535e3fc..ae59140ad3a 100644
--- a/src/mesa/glapi/glapi_dispatch.c
+++ b/src/mesa/glapi/glapi_dispatch.c
@@ -27,8 +27,8 @@
  * \file glapi_dispatch.c
  *
  * This file generates all the gl* function entrypoints.  This code is not
- * used if optimized assembly stubs are available (e.g., using x86/glapi_x86.S
- * on IA32 or sparc/glapi_sparc.S on SPARC).
+ * used if optimized assembly stubs are available (e.g., using
+ * glapi/glapi_x86.S on IA32 or glapi/glapi_sparc.S on SPARC).
  *
  * \note
  * This file is also used to build the client-side libGL that loads DRI-based
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/glapi/glapi_sparc.S
index e9f887b78f2..e9f887b78f2 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/glapi/glapi_sparc.S
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/glapi/glapi_x86-64.S
index 96930162175..96930162175 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/glapi/glapi_x86-64.S
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/glapi/glapi_x86.S
index 317f595454a..317f595454a 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/glapi/glapi_x86.S
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index c73066d69a5..9ac850ecf81 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -308,13 +308,13 @@ X86_SOURCES =			\
 	x86/read_rgba_span_x86.S
 
 X86_API =			\
-	x86/glapi_x86.S
+	glapi/glapi_x86.S
 
 X86-64_SOURCES =		\
 	x86-64/xform4.S
 
 X86-64_API =			\
-	x86-64/glapi_x86-64.S
+	glapi/glapi_x86-64.S
 
 SPARC_SOURCES =			\
 	sparc/clip.S		\
@@ -322,7 +322,7 @@ SPARC_SOURCES =			\
 	sparc/xform.S
 
 SPARC_API =			\
-	sparc/glapi_sparc.S
+	glapi/glapi_sparc.S
 
 COMMON_DRIVER_SOURCES =			\
 	drivers/common/driverfuncs.c	\