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.
This commit is contained in:
Chia-I Wu 2010-02-24 11:20:14 +08:00
parent 4cb13b433c
commit 27d260b410
9 changed files with 14 additions and 17 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -181,9 +181,6 @@
<File
RelativePath="..\..\..\..\src\mesa\main\depthstencil.c">
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\dispatch.c">
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\dlist.c">
</File>
@ -226,6 +223,9 @@
<File
RelativePath="..\..\..\..\src\mesa\glapi\glapi.c">
</File>
<File
RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c">
</File>
<File
RelativePath="..\..\..\..\src\mesa\glapi\glthread.c">
</File>

View file

@ -422,10 +422,6 @@
RelativePath="..\..\..\..\src\mesa\main\depthstencil.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\dispatch.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\dlist.c"
>
@ -494,6 +490,10 @@
RelativePath="..\..\..\..\src\mesa\glapi\glapi.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"
>