diff options
| -rw-r--r-- | src/mesa/descrip.mms | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/common/descrip.mms | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/descrip.mms | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/descrip.mms | 10 | ||||
| -rw-r--r-- | src/mesa/main/descrip.mms | 25 | ||||
| -rw-r--r-- | src/mesa/math/descrip.mms | 6 | ||||
| -rw-r--r-- | src/mesa/shader/descrip.mms | 40 | ||||
| -rw-r--r-- | src/mesa/shader/slang/descrip.mms | 49 | ||||
| -rw-r--r-- | src/mesa/swrast/descrip.mms | 18 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/descrip.mms | 7 | ||||
| -rw-r--r-- | src/mesa/tnl/descrip.mms | 37 | ||||
| -rw-r--r-- | src/mesa/vbo/descrip.mms | 4 |
12 files changed, 127 insertions, 89 deletions
diff --git a/src/mesa/descrip.mms b/src/mesa/descrip.mms index a12e3fc1b7..dbfa336a91 100644 --- a/src/mesa/descrip.mms +++ b/src/mesa/descrip.mms @@ -1,5 +1,6 @@ # Makefile for Mesa for VMS -# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl +# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl +# Date last revision : 7 March 2007 all : set default [.main] @@ -22,5 +23,5 @@ all : $(MMS)$(MMSQUALIFIERS) set default [-.swrast_setup] $(MMS)$(MMSQUALIFIERS) - set default [-.array_cache] + set default [-.vbo] $(MMS)$(MMSQUALIFIERS) diff --git a/src/mesa/drivers/common/descrip.mms b/src/mesa/drivers/common/descrip.mms index 3cb856d12c..99a2ae6c37 100644 --- a/src/mesa/drivers/common/descrip.mms +++ b/src/mesa/drivers/common/descrip.mms @@ -1,12 +1,15 @@ # Makefile for core library for VMS # contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 2 November 2005 +# Last revision : 3 October 2007 .first define gl [----.include.gl] define math [--.math] define tnl [--.tnl] define swrast [--.swrast] + define glapi [--.glapi] + define shader [--.shader] + define main [--.main] .include [----]mms-config. diff --git a/src/mesa/drivers/osmesa/descrip.mms b/src/mesa/drivers/osmesa/descrip.mms index 4035b24e4e..6c2f3226f6 100644 --- a/src/mesa/drivers/osmesa/descrip.mms +++ b/src/mesa/drivers/osmesa/descrip.mms @@ -1,15 +1,19 @@ # Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl -# Last revision : 16 June 2003 +# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl +# Last revision : 3 October 2007 .first define gl [----.include.gl] define math [--.math] define tnl [--.tnl] + define vbo [--.vbo] define swrast [--.swrast] define swrast_setup [--.swrast_setup] define array_cache [--.array_cache] define drivers [-] + define glapi [--.glapi] + define main [--.main] + define shader [--.shader] .include [----]mms-config. @@ -17,7 +21,7 @@ VPATH = RCS -INCDIR = [----.include],[--.main],[--.glapi] +INCDIR = [----.include],[--.main],[--.glapi],[--.shader] LIBDIR = [----.lib] CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms index 6c6184b2c3..648f683dfa 100644 --- a/src/mesa/drivers/x11/descrip.mms +++ b/src/mesa/drivers/x11/descrip.mms @@ -1,15 +1,19 @@ # Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl -# Last revision : 16 June 2003 +# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl +# Last revision : 3 October 2007 .first define gl [----.include.gl] define math [--.math] define tnl [--.tnl] + define vbo [--.vbo] define swrast [--.swrast] define swrast_setup [--.swrast_setup] define array_cache [--.array_cache] define drivers [-] + define glapi [--.glapi] + define main [--.main] + define shader [--.shader] .include [----]mms-config. @@ -17,7 +21,7 @@ VPATH = RCS -INCDIR = [----.include],[--.main],[--.glapi] +INCDIR = [----.include],[--.main],[--.glapi],[--.shader] LIBDIR = [----.lib] CFLAGS =/include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms index d09c57b321..3ef215f47f 100644 --- a/src/mesa/main/descrip.mms +++ b/src/mesa/main/descrip.mms @@ -1,11 +1,13 @@ # Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl -# Last revision : 10 May 2005 +# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl +# Last revision : 2 October 2007 .first define gl [---.include.gl] define math [-.math] define shader [-.shader] + define glapi [-.glapi] + define main [-.main] .include [---]mms-config. @@ -58,13 +60,13 @@ SOURCES =accum.c \ matrix.c \ mipmap.c \ mm.c \ - occlude.c \ pixel.c \ points.c \ polygon.c \ rastpos.c \ rbadaptors.c \ renderbuffer.c \ + shaders.c \ state.c \ stencil.c \ texcompress.c \ @@ -78,7 +80,9 @@ SOURCES =accum.c \ texstate.c \ texstore.c \ varray.c \ - vtxfmt.c + vtxfmt.c \ + queryobj.c \ + rbadaptors.c OBJECTS=accum.obj,\ api_arrayelt.obj,\ @@ -121,12 +125,12 @@ lines.obj,\ matrix.obj,\ mipmap.obj,\ mm.obj,\ -occlude.obj,\ pixel.obj,\ points.obj,\ polygon.obj,\ rastpos.obj,\ renderbuffer.obj,\ +shaders.obj,\ state.obj,\ stencil.obj,\ texcompress.obj,\ @@ -140,7 +144,9 @@ texrender.obj,\ texstate.obj,\ texstore.obj,\ varray.obj,\ -vtxfmt.obj +vtxfmt.obj,\ +queryobj.obj,\ +rbadaptors.obj ##### RULES ##### @@ -149,8 +155,7 @@ VERSION=Mesa V3.4 ##### TARGETS ##### # Make the library $(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ $(MAKELIB) $(GL_LIB) $(OBJECTS) - @ rename $(GL_LIB)* $(LIBDIR) + @ $(MAKELIB) $(LIBDIR)$(GL_LIB) $(OBJECTS) clean : purge @@ -197,7 +202,6 @@ lines.obj : lines.c matrix.obj : matrix.c mipmap.obj : mipmap.c mm.obj : mm.c -occlude.obj : occlude.c pixel.obj : pixel.c points.obj : points.c polygon.obj : polygon.c @@ -219,3 +223,6 @@ texstate.obj : texstate.c texstore.obj : texstore.c varray.obj : varray.c vtxfmt.obj : vtxfmt.c +shaders.obj : shaders.c +queryobj.obj : queryobj.c +rbadaptors.obj : rbadaptors.c diff --git a/src/mesa/math/descrip.mms b/src/mesa/math/descrip.mms index a3f20c2f25..3aaa6eb8b4 100644 --- a/src/mesa/math/descrip.mms +++ b/src/mesa/math/descrip.mms @@ -1,10 +1,12 @@ # Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl -# Last revision : 16 June 2003 +# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl +# Last revision : 3 October 2007 .first define gl [---.include.gl] define math [-.math] + define glapi [-.glapi] + define main [-.main] .include [---]mms-config. diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms index d70cec3830..157c193c79 100644 --- a/src/mesa/shader/descrip.mms +++ b/src/mesa/shader/descrip.mms @@ -1,11 +1,14 @@ # Makefile for core library for VMS # contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 20 November 2006 +# Last revision : 3 October 2007 .first define gl [---.include.gl] define math [-.math] define swrast [-.swrast] define array_cache [-.array_cache] + define glapi [-.glapi] + define main [-.main] + define shader [-.shader] .include [---]mms-config. @@ -23,11 +26,16 @@ SOURCES = \ arbprogram.c \ nvfragparse.c \ nvprogram.c \ - nvvertexec.c \ nvvertparse.c \ program.c \ - shaderobjects.c \ - shaderobjects_3dlabs.c + programopt.c \ + prog_debug.c \ + prog_execute.c \ + prog_instruction.c \ + prog_parameter.c \ + prog_print.c \ + prog_statevars.c \ + shader_api.c OBJECTS = \ atifragshader.obj,\ @@ -35,12 +43,16 @@ OBJECTS = \ arbprogram.obj,\ nvfragparse.obj,\ nvprogram.obj,\ - nvvertexec.obj,\ nvvertparse.obj,\ program.obj,\ - shaderobjects.obj,\ - shaderobjects_3dlabs.obj - + programopt.obj,\ + prog_debug.obj,\ + prog_execute.obj,\ + prog_instruction.obj,\ + prog_parameter.obj,\ + prog_print.obj,\ + prog_statevars.obj,\ + shader_api.obj ##### RULES ##### @@ -68,9 +80,13 @@ arbprogparse.obj : arbprogparse.c arbprogram.obj : arbprogram.c nvfragparse.obj : nvfragparse.c nvprogram.obj : nvprogram.c -nvvertexec.obj : nvvertexec.c nvvertparse.obj : nvvertparse.c program.obj : program.c -shaderobjects.obj : shaderobjects.c - cc$(CFLAGS)/nowarn shaderobjects.c -shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c +programopt. obj : programopt.c +prog_debug.obj : prog_debug.c +prog_execute.obj : prog_execute.c +prog_instruction.obj : prog_instruction.c +prog_parameter.obj : prog_parameter.c +prog_print.obj : prog_print.c +prog_statevars.obj : prog_statevars.c +shader_api.obj : shader_api.c diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms index c86763718a..6eefbcf5bd 100644 --- a/src/mesa/shader/slang/descrip.mms +++ b/src/mesa/shader/slang/descrip.mms @@ -1,12 +1,15 @@ # Makefile for core library for VMS # contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 17 March 2006 +# Last revision : 3 October 2007 .first define gl [----.include.gl] define math [--.math] define swrast [--.swrast] define array_cache [--.array_cache] + define main [--.main] + define glapi [--.glapi] + define shader [--.shader] .include [----]mms-config. @@ -21,15 +24,13 @@ CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ie SOURCES = \ slang_compile.c,slang_preprocess.c -OBJECTS = \ - slang_compile.obj,slang_preprocess.obj,slang_utility.obj,\ - slang_execute.obj,slang_assemble.obj,slang_assemble_conditional.obj,\ - slang_assemble_constructor.obj,slang_assemble_typeinfo.obj,\ - slang_storage.obj,slang_assemble_assignment.obj,\ - slang_compile_function.obj,slang_compile_struct.obj,\ - slang_compile_variable.obj,slang_compile_operation.obj,\ - slang_library_noise.obj,slang_link.obj,slang_export.obj,\ - slang_analyse.obj,slang_library_texsample.obj +OBJECTS = slang_builtin.obj,slang_codegen.obj,slang_compile.obj,\ + slang_compile_function.obj,slang_compile_operation.obj,\ + slang_compile_struct.obj,slang_compile_variable.obj,slang_emit.obj,\ + slang_ir.obj,slang_label.obj,slang_library_noise.obj,slang_link.obj,\ + slang_log.obj,slang_mem.obj,slang_preprocess.obj,slang_print.obj,\ + slang_simplify.obj,slang_storage.obj,slang_typeinfo.obj,\ + slang_utility.obj,slang_vartable.obj ##### RULES ##### @@ -44,22 +45,24 @@ clean : purge delete *.obj;* +slang_builtin.obj : slang_builtin.c +slang_codegen.obj : slang_codegen.c slang_compile.obj : slang_compile.c -slang_preprocess.obj : slang_preprocess.c -slang_utility.obj : slang_utility.c -slang_execute.obj : slang_execute.c -slang_assemble.obj : slang_assemble.c -slang_assemble_conditional.obj : slang_assemble_conditional.c -slang_assemble_constructor.obj : slang_assemble_constructor.c -slang_assemble_typeinfo.obj : slang_assemble_typeinfo.c -slang_storage.obj : slang_storage.c -slang_assemble_assignment.obj : slang_assemble_assignment.c slang_compile_function.obj : slang_compile_function.c +slang_compile_operation.obj : slang_compile_operation.c slang_compile_struct.obj : slang_compile_struct.c slang_compile_variable.obj : slang_compile_variable.c -slang_compile_operation.obj : slang_compile_operation.c +slang_emit.obj : slang_emit.c +slang_ir.obj : slang_ir.c +slang_label.obj : slang_label.c slang_library_noise.obj : slang_library_noise.c slang_link.obj : slang_link.c -slang_export.obj : slang_export.c -slang_analyse.obj : slang_analyse.c -slang_library_texsample.obj : slang_library_texsample.c +slang_log.obj : slang_log.c +slang_mem.obj : slang_mem.c +slang_preprocess.obj : slang_preprocess.c +slang_print.obj : slang_print.c +slang_simplify.obj : slang_simplify.c +slang_storage.obj : slang_storage.c +slang_typeinfo.obj : slang_typeinfo.c +slang_utility.obj : slang_utility.c +slang_vartable.obj : slang_vartable.c diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms index 4d49673b5d..0b23deb3c2 100644 --- a/src/mesa/swrast/descrip.mms +++ b/src/mesa/swrast/descrip.mms @@ -1,12 +1,15 @@ # Makefile for core library for VMS # contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 21 February 2006 +# Last revision : 3 October 2007 .first define gl [---.include.gl] define math [-.math] define swrast [-.swrast] define array_cache [-.array_cache] + define glapi [-.glapi] + define main [-.main] + define shader [-.shader] .include [---]mms-config. @@ -20,17 +23,17 @@ CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ie SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \ s_bitmap.c s_blend.c s_blit.c s_buffers.c s_context.c \ - s_copypix.c s_depth.c \ + s_copypix.c s_depth.c s_fragprog.c \ s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \ - s_masking.c s_nvfragprog.c s_points.c s_readpix.c \ + s_masking.c s_points.c s_readpix.c \ s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \ - s_triangle.c s_zoom.c s_atifragshader.c s_arbshader.c + s_triangle.c s_zoom.c s_atifragshader.c OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\ - s_bitmap.obj,s_blend.obj,s_blit.obj,s_arbshader.obj,\ + s_bitmap.obj,s_blend.obj,s_blit.obj,s_fragprog.obj,\ s_buffers.obj,s_context.obj,s_atifragshader.obj,\ s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\ - s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,s_nvfragprog.obj,\ + s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,\ s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\ s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,\ s_zoom.obj @@ -67,7 +70,6 @@ s_imaging.obj : s_imaging.c s_lines.obj : s_lines.c s_logic.obj : s_logic.c s_masking.obj : s_masking.c -s_nvfragprog.obj : s_nvfragprog.c s_points.obj : s_points.c s_readpix.obj : s_readpix.c s_span.obj : s_span.c @@ -77,4 +79,4 @@ s_texcombine.obj : s_texcombine.c s_texfilter.obj : s_texfilter.c s_triangle.obj : s_triangle.c s_zoom.obj : s_zoom.c -s_arbshader.obj : s_arbshader.c +s_fragprog.obj : s_fragprog.c diff --git a/src/mesa/swrast_setup/descrip.mms b/src/mesa/swrast_setup/descrip.mms index e5e48afb3d..32ffd80732 100644 --- a/src/mesa/swrast_setup/descrip.mms +++ b/src/mesa/swrast_setup/descrip.mms @@ -1,13 +1,16 @@ # Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl -# Last revision : 16 June 2003 +# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl +# Last revision : 3 October 2007 .first define gl [---.include.gl] define math [-.math] define tnl [-.tnl] + define vbo [-.vbo] define swrast [-.swrast] define array_cache [-.array_cache] + define glapi [-.glapi] + define main [-.main] .include [---]mms-config. diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms index 91e32bf978..54441aeeab 100644 --- a/src/mesa/tnl/descrip.mms +++ b/src/mesa/tnl/descrip.mms @@ -1,12 +1,16 @@ # Makefile for core library for VMS # contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 21 February 2006 +# Last revision : 3 October 2007 .first define gl [---.include.gl] define math [-.math] + define vbo [-.vbo] define shader [-.shader] + define swrast [-.swrast] define array_cache [-.array_cache] + define main [-.main] + define glapi [-.glapi] .include [---]mms-config. @@ -18,21 +22,19 @@ INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang] LIBDIR = [---.lib] CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm -SOURCES = t_array_api.c t_array_import.c t_context.c \ - t_pipeline.c t_vb_fog.c t_save_api.c t_vtx_api.c \ +SOURCES = t_context.c t_draw.c \ + t_pipeline.c t_vb_fog.c \ t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \ t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \ - t_vtx_eval.c t_vtx_exec.c t_save_playback.c t_save_loopback.c \ - t_vertex.c t_vtx_generic.c t_vtx_x86.c t_vertex_generic.c \ - t_vb_arbprogram.c t_vp_build.c t_vb_arbshader.c + t_vertex.c \ + t_vertex_generic.c t_vp_build.c -OBJECTS = t_array_api.obj,t_array_import.obj,t_context.obj,\ +OBJECTS = t_context.obj,t_draw.obj,\ t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\ t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\ - t_vb_texmat.obj,t_vb_vertex.obj,t_save_api.obj,t_vtx_api.obj,\ - t_vtx_eval.obj,t_vtx_exec.obj,t_save_playback.obj,t_save_loopback.obj,\ - t_vertex.obj,t_vtx_generic.obj,t_vtx_x86.obj,t_vertex_generic.obj,\ - t_vb_arbprogram.obj,t_vp_build.obj,t_vb_arbshader.obj + t_vb_texmat.obj,t_vb_vertex.obj,\ + t_vertex.obj,t_vertex_generic.obj,\ + t_vp_build.obj ##### RULES ##### @@ -47,9 +49,8 @@ clean : purge delete *.obj;* -t_array_api.obj : t_array_api.c -t_array_import.obj : t_array_import.c t_context.obj : t_context.c +t_draw.obj : t_draw.c t_pipeline.obj : t_pipeline.c t_vb_fog.obj : t_vb_fog.c t_vb_light.obj : t_vb_light.c @@ -60,16 +61,6 @@ t_vb_render.obj : t_vb_render.c t_vb_texgen.obj : t_vb_texgen.c t_vb_texmat.obj : t_vb_texmat.c t_vb_vertex.obj : t_vb_vertex.c -t_save_api.obj : t_save_api.c -t_vtx_api.obj : t_vtx_api.c -t_vtx_eval.obj : t_vtx_eval.c -t_vtx_exec.obj : t_vtx_exec.c -t_save_playback.obj : t_save_playback.c -t_save_loopback.obj : t_save_loopback.c t_vertex.obj : t_vertex.c -t_vtx_x86.obj : t_vtx_x86.c -t_vtx_generic.obj : t_vtx_generic.c t_vertex_generic.obj : t_vertex_generic.c -t_vb_arbprogram.obj : t_vb_arbprogram.c t_vp_build.obj : t_vp_build.c -t_vb_arbshader.obj : t_vb_arbshader.c diff --git a/src/mesa/vbo/descrip.mms b/src/mesa/vbo/descrip.mms index 4ab22e4005..c2a16a04f5 100644 --- a/src/mesa/vbo/descrip.mms +++ b/src/mesa/vbo/descrip.mms @@ -1,6 +1,6 @@ # Makefile for core library for VMS # contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 7 March 2007 +# Last revision : 3 October 2007 .first define gl [---.include.gl] @@ -10,6 +10,8 @@ define shader [-.shader] define swrast [-.swrast] define swrast_setup [-.swrast_setup] + define main [-.main] + define glapi [-.glapi] .include [---]mms-config. |