diff options
author | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2001-03-20 10:18:13 +0000 |
---|---|---|
committer | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2001-03-20 10:18:13 +0000 |
commit | f3e31787514269c75b21cbee6c6e98fab4c40b01 (patch) | |
tree | d9d8e7e050c50e593049f4d6ca94a90e6e21f2c8 /src/mesa/main | |
parent | 68af9a0773d506aa04c79a178922464aa0c64ad5 (diff) |
Committing in .
Modified Files:
Mesa/src/descrip.mms Mesa/src/texutil_tmp.h
-Updated VMS makefile
-__FUNCTION__ is not a defined on VMS (and maybe other systems) For VMS
__FUNCTION__ is defined to in texutil_tmp.h
----------------------------------------------------------------------
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/descrip.mms | 10 | ||||
-rw-r--r-- | src/mesa/main/texutil_tmp.h | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms index 486dbe62858..c52e5e4a1d7 100644 --- a/src/mesa/main/descrip.mms +++ b/src/mesa/main/descrip.mms @@ -68,6 +68,7 @@ CORE_SOURCES =accum.c \ scissor.c \ state.c \ stencil.c \ + texformat.c \ teximage.c \ texobj.c \ texstate.c \ @@ -105,6 +106,7 @@ 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 \ @@ -115,6 +117,7 @@ RASTER_SOURCES = [.swrast]s_aatriangle.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 \ @@ -218,6 +221,7 @@ readpix.obj,\ scissor.obj,\ state.obj,\ stencil.obj,\ +texformat.obj,\ teximage.obj,\ texobj.obj,\ texstate.obj,\ @@ -256,6 +260,7 @@ 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,\ @@ -268,6 +273,7 @@ OBJECTS9=[.swrast]s_readpix.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,\ @@ -451,6 +457,8 @@ 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 @@ -471,6 +479,8 @@ imports.obj : imports.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 diff --git a/src/mesa/main/texutil_tmp.h b/src/mesa/main/texutil_tmp.h index 7786a14612d..6a1f002fc8a 100644 --- a/src/mesa/main/texutil_tmp.h +++ b/src/mesa/main/texutil_tmp.h @@ -1,4 +1,4 @@ -/* $Id: texutil_tmp.h,v 1.3 2001/03/18 13:34:24 gareth Exp $ */ +/* $Id: texutil_tmp.h,v 1.4 2001/03/20 10:18:13 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -31,6 +31,10 @@ * NOTE: All 3D code is untested and most definitely broken... */ +#ifdef VMS +#define __FUNCTION__ +#endif + #define DST_TEXEL_BYTES (4 / DST_TEXELS_PER_DWORD) #define DST_ROW_WIDTH (convert->width * DST_TEXEL_BYTES) #define DST_ROW_STRIDE (convert->imageWidth * DST_TEXEL_BYTES) |