KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: move arbprogram.[ch] to main/

This commit is contained in:
Brian Paul 2010-06-10 22:32:21 -06:00
parent 70c8d29b6b
commit 412cddf954
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/SConscript
View File

@ -31,6 +31,7 @@ if env['platform'] != 'winddk':
'main/api_noop.c', 'main/api_noop.c',
'main/api_validate.c', 'main/api_validate.c',
'main/accum.c', 'main/accum.c',
'main/arbprogram.c',
'main/atifragshader.c', 'main/atifragshader.c',
'main/attrib.c', 'main/attrib.c',
'main/arrayobj.c', 'main/arrayobj.c',
@ -197,7 +198,6 @@ if env['platform'] != 'winddk':
shader_sources = [ shader_sources = [
'shader/arbprogparse.c', 'shader/arbprogparse.c',
'shader/arbprogram.c',
'shader/hash_table.c', 'shader/hash_table.c',
'shader/lex.yy.c', 'shader/lex.yy.c',
'shader/nvfragparse.c', 'shader/nvfragparse.c',

2
src/mesa/drivers/common/meta.c
View File

@ -34,6 +34,7 @@
#include "main/glheader.h" #include "main/glheader.h"
#include "main/mtypes.h" #include "main/mtypes.h"
#include "main/imports.h" #include "main/imports.h"
#include "main/arbprogram.h"
#include "main/arrayobj.h" #include "main/arrayobj.h"
#include "main/blend.h" #include "main/blend.h"
#include "main/bufferobj.h" #include "main/bufferobj.h"
@ -62,7 +63,6 @@
#include "main/varray.h" #include "main/varray.h"
#include "main/viewport.h" #include "main/viewport.h"
#include "shader/program.h" #include "shader/program.h"
#include "shader/arbprogram.h"
#include "swrast/swrast.h" #include "swrast/swrast.h"
#include "drivers/common/meta.h" #include "drivers/common/meta.h"

2
src/mesa/drivers/dri/common/dri_metaops.c
View File

@ -26,6 +26,7 @@
* *
**************************************************************************/ **************************************************************************/
#include "main/arbprogram.h"
#include "main/arrayobj.h" #include "main/arrayobj.h"
#include "main/bufferobj.h" #include "main/bufferobj.h"
#include "main/enable.h" #include "main/enable.h"
@ -33,7 +34,6 @@
#include "main/texstate.h" #include "main/texstate.h"
#include "main/varray.h" #include "main/varray.h"
#include "main/viewport.h" #include "main/viewport.h"
#include "shader/arbprogram.h"
#include "shader/program.h" #include "shader/program.h"
#include "dri_metaops.h" #include "dri_metaops.h"

2
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
View File

@ -26,6 +26,7 @@
**************************************************************************/ **************************************************************************/
#include "main/glheader.h" #include "main/glheader.h"
#include "main/arbprogram.h"
#include "main/enums.h" #include "main/enums.h"
#include "main/image.h" #include "main/image.h"
#include "main/colormac.h" #include "main/colormac.h"
@ -44,7 +45,6 @@
#include "main/attrib.h" #include "main/attrib.h"
#include "main/enable.h" #include "main/enable.h"
#include "main/viewport.h" #include "main/viewport.h"
#include "shader/arbprogram.h"
#include "swrast/swrast.h" #include "swrast/swrast.h"
#include "intel_screen.h" #include "intel_screen.h"

2
src/mesa/main/api_exec.c
View File

@ -34,7 +34,7 @@
#include "api_loopback.h" #include "api_loopback.h"
#include "api_exec.h" #include "api_exec.h"
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
#include "shader/arbprogram.h" #include "arbprogram.h"
#endif #endif
#include "atifragshader.h" #include "atifragshader.h"
#include "attrib.h" #include "attrib.h"

10
src/mesa/shader/arbprogram.c → src/mesa/main/arbprogram.c
View File

@ -35,11 +35,11 @@
#include "main/imports.h" #include "main/imports.h"
#include "main/macros.h" #include "main/macros.h"
#include "main/mtypes.h" #include "main/mtypes.h"
#include "arbprogram.h" #include "main/arbprogram.h"
#include "arbprogparse.h" #include "shader/arbprogparse.h"
#include "nvfragparse.h" #include "shader/nvfragparse.h"
#include "nvvertparse.h" #include "shader/nvvertparse.h"
#include "program.h" #include "shader/program.h"

0
src/mesa/shader/arbprogram.h → src/mesa/main/arbprogram.h
View File

2
src/mesa/main/dlist.c
View File

@ -59,7 +59,7 @@
#include "mtypes.h" #include "mtypes.h"
#include "varray.h" #include "varray.h"
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
#include "shader/arbprogram.h" #include "arbprogram.h"
#endif #endif
#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
#include "shader/nvprogram.h" #include "shader/nvprogram.h"

2
src/mesa/sources.mak
View File

@ -12,6 +12,7 @@ MAIN_SOURCES = \
main/api_noop.c \ main/api_noop.c \
main/api_validate.c \ main/api_validate.c \
main/accum.c \ main/accum.c \
main/arbprogram.c \
main/atifragshader.c \ main/atifragshader.c \
main/attrib.c \ main/attrib.c \
main/arrayobj.c \ main/arrayobj.c \
@ -228,7 +229,6 @@ STATETRACKER_SOURCES = \
SHADER_SOURCES = \ SHADER_SOURCES = \
shader/arbprogparse.c \ shader/arbprogparse.c \
shader/arbprogram.c \
shader/hash_table.c \ shader/hash_table.c \
shader/lex.yy.c \ shader/lex.yy.c \
shader/nvfragparse.c \ shader/nvfragparse.c \