diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-02-24 11:20:14 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-02-25 21:32:58 +0800 |
| commit | 27d260b41038e0c19c8f24b8bdb2c004c1eb7aa2 (patch) | |
| tree | a0f1060d6be58eee33228539baac35c7e7d565dc /src | |
| parent | 4cb13b433cfdaa1295e5df048d7ef614545f6e16 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/Makefile.mgw | 2 | ||||
| -rw-r--r-- | src/mesa/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi_dispatch.c (renamed from src/mesa/main/dispatch.c) | 2 | ||||
| -rw-r--r-- | src/mesa/main/descrip.mms | 3 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw index e894c6277d..b90384d04a 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 0726fcb1a7..0a25dccde5 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 index b9b726b001..4cb43f4505 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 e49ec65d42..70bc263726 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 354331955a..9f2e4e5157 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 |