fixed pointer arithmetic error in glCopyPixels

[mesa.git] / src / mesa / main / descrip.mms

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index 486dbe62858cd2efc0760e7fc3c0b6e461d390e6..8caeeb5803ae09845061c13bb31884bbb88b1914 100644 (file)
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -16,12 +16,10 @@ LIBDIR = [-.lib]
 CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
 
 CORE_SOURCES =accum.c \
-       alpha.c \
        api_loopback.c \
        api_noop.c \
        api_validate.c \
        attrib.c \
-       bitmap.c \
        blend.c \
        buffers.c \
        clip.c \
@@ -29,7 +27,6 @@ CORE_SOURCES =accum.c \
        config.c \
        context.c \
        convolve.c \
-       copypix.c \
        debug.c \
        depth.c \
        dispatch.c \
@@ -43,7 +40,6 @@ CORE_SOURCES =accum.c \
        fog.c \
        get.c \
        glapi.c \
-       glapinoop.c \
        glthread.c \
        hash.c \
        highpc.c \
@@ -53,21 +49,17 @@ CORE_SOURCES =accum.c \
        imports.c \
        light.c \
        lines.c \
-       logic.c \
        lowpc.c \
-       masking.c \
        matrix.c \
        mem.c \
        mmath.c \
        pixel.c \
-       pixeltex.c \
        points.c \
        polygon.c \
        rastpos.c \
-       readpix.c \
-       scissor.c \
        state.c \
        stencil.c \
+       texformat.c \
        teximage.c \
        texobj.c \
        texstate.c \
@@ -75,7 +67,9 @@ CORE_SOURCES =accum.c \
        texutil.c \
        varray.c \
        vtxfmt.c \
-       winpos.c \
+       vpstate.c \
+       vpexec.c \
+       vtparse.c \
        [.x86]x86.c
 
 DRIVER_SOURCES = [.x]glxapi.c [.x]fakeglx.c [.x]xfonts.c \
@@ -105,21 +99,20 @@ RASTER_SOURCES = [.swrast]s_aatriangle.c \
 [.swrast]s_fog.c \
 [.swrast]s_feedback.c \
 [.swrast]s_histogram.c \
+[.swrast]s_imaging.c \
 [.swrast]s_lines.c \
 [.swrast]s_logic.c \
 [.swrast]s_masking.c \
-[.swrast]s_pb.c \
 [.swrast]s_pixeltex.c \
 [.swrast]s_points.c \
 [.swrast]s_readpix.c \
-[.swrast]s_scissor.c \
 [.swrast]s_span.c \
 [.swrast]s_stencil.c \
+[.swrast]s_texstore.c \
 [.swrast]s_texture.c \
 [.swrast]s_triangle.c \
 [.swrast]s_zoom.c \
 [.swrast_setup]ss_context.c \
-[.swrast_setup]ss_interp.c \
 [.swrast_setup]ss_triangle.c \
 [.swrast_setup]ss_vb.c 
 
@@ -142,6 +135,7 @@ TNL_SOURCES=[.tnl]t_array_api.c \
 [.tnl]t_vb_light.c \
 [.tnl]t_vb_normals.c \
 [.tnl]t_vb_points.c \
+[.tnl]t_vb_program.c \
 [.tnl]t_vb_render.c \
 [.tnl]t_vb_texgen.c \
 [.tnl]t_vb_texmat.c \
@@ -164,12 +158,10 @@ CACHE_SOURCES=[.array_cache]ac_context.c \
        [.array_cache]ac_import.c
  
 OBJECTS1=accum.obj,\
-alpha.obj,\
 api_loopback.obj,\
 api_noop.obj,\
 api_validate.obj,\
 attrib.obj,\
-bitmap.obj,\
 blend.obj,\
 buffers.obj,\
 clip.obj,\
@@ -177,7 +169,6 @@ colortab.obj,\
 config.obj,\
 context.obj,\
 convolve.obj,\
-copypix.obj,\
 debug.obj,\
 depth.obj,\
 dispatch.obj,\
@@ -192,7 +183,6 @@ feedback.obj,\
 fog.obj,\
 get.obj,\
 glapi.obj,\
-glapinoop.obj,\
 glthread.obj,\
 hash.obj,\
 highpc.obj,\
@@ -202,22 +192,18 @@ image.obj,\
 imports.obj,\
 light.obj,\
 lines.obj,\
-logic.obj,\
 lowpc.obj,\
-masking.obj,\
 matrix.obj,\
 mem.obj
 
 OBJECTS3=mmath.obj,\
 pixel.obj,\
-pixeltex.obj,\
 points.obj,\
 polygon.obj,\
 rastpos.obj,\
-readpix.obj,\
-scissor.obj,\
 state.obj,\
 stencil.obj,\
+texformat.obj,\
 teximage.obj,\
 texobj.obj,\
 texstate.obj,\
@@ -225,7 +211,9 @@ texstore.obj,\
 texutil.obj,\
 varray.obj,\
 vtxfmt.obj,\
-winpos.obj,\
+vpstate.obj,\
+vpexec.obj,\
+vpparse.obj,\
 [.x86]x86.obj
 
 OBJECTS4=[.x]glxapi.obj,[.x]fakeglx.obj,[.x]xfonts.obj,\
@@ -256,25 +244,24 @@ OBJECTS7=[.swrast]s_aatriangle.obj,\
 OBJECTS8=[.swrast]s_drawpix.obj,\
 [.swrast]s_fog.obj,\
 [.swrast]s_histogram.obj,\
+[.swrast]s_imaging.obj,\
 [.swrast]s_lines.obj,\
 [.swrast]s_logic.obj,\
 [.swrast]s_masking.obj,\
-[.swrast]s_pb.obj,\
 [.swrast]s_pixeltex.obj,\
 [.swrast]s_points.obj
 
 OBJECTS9=[.swrast]s_readpix.obj,\
 [.swrast]s_aaline.obj,\
-[.swrast]s_scissor.obj,\
 [.swrast]s_span.obj,\
 [.swrast]s_stencil.obj,\
+[.swrast]s_texstore.obj,\
 [.swrast]s_texture.obj,\
 [.swrast]s_triangle.obj,\
 [.swrast]s_feedback.obj,\
 [.swrast]s_zoom.obj
 
 OBJECTS10=[.swrast_setup]ss_context.obj,\
-[.swrast_setup]ss_interp.obj,\
 [.swrast_setup]ss_triangle.obj,\
 [.swrast_setup]ss_vb.obj 
 
@@ -296,6 +283,7 @@ OBJECTS12=[.tnl]t_imm_fixup.obj,\
 [.tnl]t_vb_light.obj,\
 [.tnl]t_vb_normals.obj,\
 [.tnl]t_vb_points.obj,\
+[.tnl]t_vb_program.obj,\
 [.tnl]t_vb_render.obj,\
 [.tnl]t_vb_texgen.obj,\
 [.tnl]t_vb_texmat.obj,\
@@ -451,26 +439,26 @@ imports.obj : imports.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_fog.obj [.swrast]s_fog.c
 [.swrast]s_histogram.obj : [.swrast]s_histogram.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_histogram.obj [.swrast]s_histogram.c
+[.swrast]s_imaging.obj : [.swrast]s_imaging.c
+       $(CC) $(CFLAGS) /obj=[.swrast]s_imaging.obj [.swrast]s_imaging.c
 [.swrast]s_lines.obj : [.swrast]s_lines.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_lines.obj [.swrast]s_lines.c
 [.swrast]s_logic.obj : [.swrast]s_logic.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_logic.obj [.swrast]s_logic.c
 [.swrast]s_masking.obj : [.swrast]s_masking.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_masking.obj [.swrast]s_masking.c
-[.swrast]s_pb.obj : [.swrast]s_pb.c
-       $(CC) $(CFLAGS) /obj=[.swrast]s_pb.obj [.swrast]s_pb.c
 [.swrast]s_pixeltex.obj : [.swrast]s_pixeltex.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_pixeltex.obj [.swrast]s_pixeltex.c
 [.swrast]s_points.obj : [.swrast]s_points.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_points.obj [.swrast]s_points.c
 [.swrast]s_readpix.obj : [.swrast]s_readpix.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_readpix.obj [.swrast]s_readpix.c
-[.swrast]s_scissor.obj : [.swrast]s_scissor.c
-       $(CC) $(CFLAGS) /obj=[.swrast]s_scissor.obj [.swrast]s_scissor.c
 [.swrast]s_span.obj : [.swrast]s_span.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_span.obj [.swrast]s_span.c
 [.swrast]s_stencil.obj : [.swrast]s_stencil.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_stencil.obj [.swrast]s_stencil.c
+[.swrast]s_texstore.obj : [.swrast]s_texstore.c
+       $(CC) $(CFLAGS) /obj=[.swrast]s_texstore.obj [.swrast]s_texstore.c
 [.swrast]s_texture.obj : [.swrast]s_texture.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_texture.obj [.swrast]s_texture.c
 [.swrast]s_triangle.obj : [.swrast]s_triangle.c
@@ -479,8 +467,6 @@ imports.obj : imports.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_zoom.obj [.swrast]s_zoom.c
 [.swrast_setup]ss_context.obj : [.swrast_setup]ss_context.c
        $(CC) $(CFLAGS) /obj=[.swrast_setup]ss_context.obj [.swrast_setup]ss_context.c
-[.swrast_setup]ss_interp.obj : [.swrast_setup]ss_interp.c
-       $(CC) $(CFLAGS) /obj=[.swrast_setup]ss_interp.obj [.swrast_setup]ss_interp.c
 [.swrast_setup]ss_triangle.obj : [.swrast_setup]ss_triangle.c
        $(CC) $(CFLAGS) /obj=[.swrast_setup]ss_triangle.obj [.swrast_setup]ss_triangle.c
 [.swrast_setup]ss_vb.obj : [.swrast_setup]ss_vb.c
@@ -519,6 +505,8 @@ imports.obj : imports.c
        $(CC) $(CFLAGS) /obj=[.tnl]t_vb_normals.obj [.tnl]t_vb_normals.c
 [.tnl]t_vb_points.obj : [.tnl]t_vb_points.c
        $(CC) $(CFLAGS) /obj=[.tnl]t_vb_points.obj [.tnl]t_vb_points.c
+[.tnl]t_vb_program.obj : [.tnl]t_vb_program.c
+       $(CC) $(CFLAGS) /obj=[.tnl]t_vb_program.obj [.tnl]t_vb_program.c
 [.tnl]t_vb_render.obj : [.tnl]t_vb_render.c
        $(CC) $(CFLAGS) /obj=[.tnl]t_vb_render.obj [.tnl]t_vb_render.c
 [.tnl]t_vb_texgen.obj : [.tnl]t_vb_texgen.c