Allow current trunk to build against Mesa trunk
This commit is contained in:
parent
0d9ed2624f
commit
2e28f4104d
|
@ -34,6 +34,7 @@ nodist_libmain_la_SOURCES = accum.c \
|
||||||
convolve.c \
|
convolve.c \
|
||||||
debug.c \
|
debug.c \
|
||||||
depth.c \
|
depth.c \
|
||||||
|
depthstencil.c \
|
||||||
dlist.c \
|
dlist.c \
|
||||||
drawpix.c \
|
drawpix.c \
|
||||||
enable.c \
|
enable.c \
|
||||||
|
|
|
@ -19,15 +19,14 @@ INCLUDES = -I@MESA_SOURCE@/include \
|
||||||
-I.. \
|
-I.. \
|
||||||
-I$(top_srcdir)/hw/xfree86/os-support
|
-I$(top_srcdir)/hw/xfree86/os-support
|
||||||
|
|
||||||
nodist_libshader_la_SOURCES = arbfragparse.c \
|
nodist_libshader_la_SOURCES = \
|
||||||
arbprogparse.c \
|
arbprogparse.c \
|
||||||
arbprogram.c \
|
arbprogram.c \
|
||||||
arbvertparse.c \
|
|
||||||
atifragshader.c \
|
atifragshader.c \
|
||||||
nvfragparse.c \
|
nvfragparse.c \
|
||||||
nvprogram.c \
|
nvprogram.c \
|
||||||
nvvertexec.c \
|
nvvertexec.c \
|
||||||
nvvertparse.c \
|
nvvertparse.c \
|
||||||
program.c \
|
program.c \
|
||||||
shaderobjects.c \
|
shaderobjects.c \
|
||||||
shaderobjects_3dlabs.c
|
shaderobjects_3dlabs.c
|
||||||
|
|
|
@ -29,19 +29,17 @@ nodist_libswrast_la_SOURCES = s_aaline.c \
|
||||||
s_drawpix.c \
|
s_drawpix.c \
|
||||||
s_feedback.c \
|
s_feedback.c \
|
||||||
s_fog.c \
|
s_fog.c \
|
||||||
s_fragprog_to_c.c \
|
|
||||||
s_imaging.c \
|
s_imaging.c \
|
||||||
s_lines.c \
|
s_lines.c \
|
||||||
s_logic.c \
|
s_logic.c \
|
||||||
s_masking.c \
|
s_masking.c \
|
||||||
s_nvfragprog.c \
|
s_nvfragprog.c \
|
||||||
s_pixeltex.c \
|
|
||||||
s_points.c \
|
s_points.c \
|
||||||
s_readpix.c \
|
s_readpix.c \
|
||||||
s_span.c \
|
s_span.c \
|
||||||
s_stencil.c \
|
s_stencil.c \
|
||||||
s_tcc.c \
|
s_texcombine.c \
|
||||||
|
s_texfilter.c \
|
||||||
s_texstore.c \
|
s_texstore.c \
|
||||||
s_texture.c \
|
|
||||||
s_triangle.c \
|
s_triangle.c \
|
||||||
s_zoom.c
|
s_zoom.c
|
||||||
|
|
|
@ -110,6 +110,8 @@ symlink_mesa_main() {
|
||||||
action debug.h
|
action debug.h
|
||||||
action depth.c
|
action depth.c
|
||||||
action depth.h
|
action depth.h
|
||||||
|
action depthstencil.c
|
||||||
|
action depthstencil.h
|
||||||
action dlist.c
|
action dlist.c
|
||||||
action dlist.h
|
action dlist.h
|
||||||
action drawpix.c
|
action drawpix.c
|
||||||
|
@ -269,7 +271,6 @@ symlink_mesa_swrast() {
|
||||||
action s_feedback.h
|
action s_feedback.h
|
||||||
action s_fog.c
|
action s_fog.c
|
||||||
action s_fog.h
|
action s_fog.h
|
||||||
action s_fragprog_to_c.c
|
|
||||||
action s_imaging.c
|
action s_imaging.c
|
||||||
action s_lines.c
|
action s_lines.c
|
||||||
action s_lines.h
|
action s_lines.h
|
||||||
|
@ -280,8 +281,6 @@ symlink_mesa_swrast() {
|
||||||
action s_masking.h
|
action s_masking.h
|
||||||
action s_nvfragprog.c
|
action s_nvfragprog.c
|
||||||
action s_nvfragprog.h
|
action s_nvfragprog.h
|
||||||
action s_pixeltex.c
|
|
||||||
action s_pixeltex.h
|
|
||||||
action s_points.c
|
action s_points.c
|
||||||
action s_points.h
|
action s_points.h
|
||||||
action s_pointtemp.h
|
action s_pointtemp.h
|
||||||
|
@ -291,10 +290,11 @@ symlink_mesa_swrast() {
|
||||||
action s_spantemp.h
|
action s_spantemp.h
|
||||||
action s_stencil.c
|
action s_stencil.c
|
||||||
action s_stencil.h
|
action s_stencil.h
|
||||||
action s_tcc.c
|
action s_texcombine.c
|
||||||
|
action s_texcombine.h
|
||||||
|
action s_texfilter.c
|
||||||
|
action s_texfilter.h
|
||||||
action s_texstore.c
|
action s_texstore.c
|
||||||
action s_texture.c
|
|
||||||
action s_texture.h
|
|
||||||
action s_triangle.c
|
action s_triangle.c
|
||||||
action s_triangle.h
|
action s_triangle.h
|
||||||
action s_trispan.h
|
action s_trispan.h
|
||||||
|
@ -368,29 +368,24 @@ symlink_mesa_shader() {
|
||||||
src_dir src/mesa/shader
|
src_dir src/mesa/shader
|
||||||
dst_dir mesa/shader
|
dst_dir mesa/shader
|
||||||
|
|
||||||
action arbfragparse.c
|
|
||||||
action arbfragparse.h
|
|
||||||
action arbprogparse.c
|
action arbprogparse.c
|
||||||
action arbprogparse.h
|
action arbprogparse.h
|
||||||
action arbprogram.c
|
action arbprogram.c
|
||||||
action arbprogram.h
|
action arbprogram.h
|
||||||
action arbprogram_syn.h
|
action arbprogram_syn.h
|
||||||
action arbvertparse.c
|
|
||||||
action arbvertparse.h
|
|
||||||
action atifragshader.c
|
action atifragshader.c
|
||||||
action atifragshader.h
|
action atifragshader.h
|
||||||
action nvfragparse.c
|
action nvfragparse.c
|
||||||
action nvfragparse.h
|
action nvfragparse.h
|
||||||
action nvfragprog.h
|
|
||||||
action nvprogram.c
|
action nvprogram.c
|
||||||
action nvprogram.h
|
action nvprogram.h
|
||||||
action nvvertexec.c
|
action nvvertexec.c
|
||||||
action nvvertexec.h
|
action nvvertexec.h
|
||||||
action nvvertparse.c
|
action nvvertparse.c
|
||||||
action nvvertparse.h
|
action nvvertparse.h
|
||||||
action nvvertprog.h
|
|
||||||
action program.c
|
action program.c
|
||||||
action program.h
|
action program.h
|
||||||
|
action program_instruction.h
|
||||||
action shaderobjects.c
|
action shaderobjects.c
|
||||||
action shaderobjects.h
|
action shaderobjects.h
|
||||||
action shaderobjects_3dlabs.c
|
action shaderobjects_3dlabs.c
|
||||||
|
|
Loading…
Reference in New Issue
Block a user