Mesa (master): glapi: Move src/mesa/main/dispatch.c to glapi and rename.
Chia-I Wu
olv at kemper.freedesktop.org
Thu Feb 25 13:48:26 UTC 2010
Module: Mesa
Branch: master
Commit: 27d260b41038e0c19c8f24b8bdb2c004c1eb7aa2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27d260b41038e0c19c8f24b8bdb2c004c1eb7aa2
Author: Chia-I Wu <olv at lunarg.com>
Date: Wed Feb 24 11:20:14 2010 +0800
glapi: Move src/mesa/main/dispatch.c to glapi and rename.
main/dispatch.c is a glapi source file. It is part of GLAPI_SOURCES in
sources.mak and part of glapi_sources in SConscript. This commit moves
it to glapi/ and renames it to glapi_dispatch.c.
---
docs/devinfo.html | 2 +-
docs/dispatch.html | 4 ++--
src/mesa/Makefile.mgw | 2 +-
src/mesa/SConscript | 2 +-
.../{main/dispatch.c => glapi/glapi_dispatch.c} | 2 +-
src/mesa/main/descrip.mms | 3 ---
src/mesa/sources.mak | 2 +-
windows/VC7/mesa/mesa/mesa.vcproj | 6 +++---
windows/VC8/mesa/mesa/mesa.vcproj | 8 ++++----
9 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/docs/devinfo.html b/docs/devinfo.html
index 0fb8167..df0e726 100644
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -107,7 +107,7 @@ Global variables are not allowed.
Function name examples:
</p>
<pre>
- glFooBar() - a public GL entry point (in dispatch.c)
+ glFooBar() - a public GL entry point (in glapi_dispatch.c)
_mesa_FooBar() - the internal immediate mode function
save_FooBar() - retained mode (display list) function in dlist.c
foo_bar() - a static (private) function
diff --git a/docs/dispatch.html b/docs/dispatch.html
index bcab74c..0c54a84 100644
--- a/docs/dispatch.html
+++ b/docs/dispatch.html
@@ -244,8 +244,8 @@ isn't a significant problem.</p>
system. There are two steps to this. The file must first be added to
<tt>src/mesa/sources</tt>. That gets the file built and linked. The second
step is to add the correct <tt>#ifdef</tt> magic to
-<tt>src/mesa/main/dispatch.c</tt> to prevent the C version of the dispatch
-functions from being built.</p>
+<tt>src/mesa/glapi/glapi_dispatch.c</tt> to prevent the C version of the
+dispatch functions from being built.</p>
<A NAME="fixedsize"/>
<H3>3.4. Fixed-Length Dispatch Stubs</H3>
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
index e894c62..b90384d 100644
--- a/src/mesa/Makefile.mgw
+++ b/src/mesa/Makefile.mgw
@@ -200,7 +200,7 @@ ifeq (1,1)
x86/glapi_x86.o: x86/glapi_x86.S
$(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
else
-main/dispatch.o: main/dispatch.c
+glapi/glapi_dispatch.o: glapi/glapi_dispatch.c
$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
glapi/glapi.o: glapi/glapi.c
$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 0726fcb..0a25dcc 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -247,8 +247,8 @@ if env['platform'] != 'winddk':
)
glapi_sources = [
- 'main/dispatch.c',
'glapi/glapi.c',
+ 'glapi/glapi_dispatch.c',
'glapi/glapi_getproc.c',
'glapi/glapi_nop.c',
'glapi/glthread.c',
diff --git a/src/mesa/main/dispatch.c b/src/mesa/glapi/glapi_dispatch.c
similarity index 99%
rename from src/mesa/main/dispatch.c
rename to src/mesa/glapi/glapi_dispatch.c
index b9b726b..4cb43f4 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/glapi/glapi_dispatch.c
@@ -24,7 +24,7 @@
/**
- * \file dispatch.c
+ * \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
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index e49ec65..70bc263 100644
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -38,7 +38,6 @@ SOURCES =accum.c \
debug.c \
depth.c \
depthstencil.c \
- dispatch.c \
dlist.c \
drawpix.c \
enable.c \
@@ -113,7 +112,6 @@ convolve.obj,\
debug.obj,\
depth.obj,\
depthstencil.obj,\
-dispatch.obj,\
dlist.obj,\
drawpix.obj,\
enable.obj,\
@@ -198,7 +196,6 @@ convolve.obj : convolve.c
debug.obj : debug.c
depth.obj : depth.c
depthstencil.obj : depthstencil.c
-dispatch.obj : dispatch.c
dlist.obj : dlist.c
drawpix.obj : drawpix.c
enable.obj : enable.c
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 3543319..9f2e4e5 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -86,8 +86,8 @@ MAIN_SOURCES = \
main/vtxfmt.c
GLAPI_SOURCES = \
- main/dispatch.c \
glapi/glapi.c \
+ glapi/glapi_dispatch.c \
glapi/glapi_getproc.c \
glapi/glapi_nop.c \
glapi/glthread.c
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index caee6c0..623e001 100644
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -182,9 +182,6 @@
RelativePath="..\..\..\..\src\mesa\main\depthstencil.c">
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\dispatch.c">
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\main\dlist.c">
</File>
<File
@@ -227,6 +224,9 @@
RelativePath="..\..\..\..\src\mesa\glapi\glapi.c">
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c">
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\glapi\glthread.c">
</File>
<File
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 15ad229..8795746 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -423,10 +423,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\dispatch.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\main\dlist.c"
>
</File>
@@ -495,6 +491,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"
>
</File>
More information about the mesa-commit
mailing list