fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 14:50:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

glapi: Move assembly dispatchers back into glapi/.

Browse source
This commit is contained in:
Chia-I Wu 2010-04-26 12:47:07 +08:00
parent 4d52a25326
commit 73ded0624d
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/SConscript
View file

@ -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

12
src/mesa/es/glapi/Makefile
View file

@ -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)

12
src/mesa/glapi/gen/Makefile
View file

@ -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) $< > $@
######################################################################

4
src/mesa/glapi/glapi_dispatch.c
View file

@ -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

0
src/mesa/sparc/glapi_sparc.S → src/mesa/glapi/glapi_sparc.S
View file

0
src/mesa/x86-64/glapi_x86-64.S → src/mesa/glapi/glapi_x86-64.S
View file

0
src/mesa/x86/glapi_x86.S → src/mesa/glapi/glapi_x86.S
View file

6
src/mesa/sources.mak
View file

@ -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 \