diff options
| author | Keith Whitwell <[email protected]> | 2000-11-05 18:40:57 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2000-11-05 18:40:57 +0000 |
| commit | 14940c4ffe066a8b85bc14274c19ad3d8e334d61 (patch) | |
| tree | f131b862b3215f81e638100c86736330c0dd592b /src/mesa/Makefile.X11 | |
| parent | 1e885f6e6ce9c46c3220eb0472bdfe2aa7946596 (diff) | |
- Changes for new software rasterizer modules
- Remove support for choosing software fallbacks from core code
- Remove partial fallback code from vbrender.c -- drivers are now
expected to be able to find a triangle/quad function for every state,
even if they have to use _swsetup_Triangle or _swsetup_Quad.
- Marked derived variables in the GLcontext struct with a leading
underscore '_'.
Diffstat (limited to 'src/mesa/Makefile.X11')
| -rw-r--r-- | src/mesa/Makefile.X11 | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index 32326d6d5ed..4dbab5b4bea 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.27 2000/10/31 18:09:44 keithw Exp $ +# $Id: Makefile.X11,v 1.28 2000/11/05 18:40:57 keithw Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -108,6 +108,7 @@ CORE_SOURCES = \ swrast/s_context.c \ swrast/s_depth.c \ swrast/s_drawpix.c \ + swrast/s_feedback.c \ swrast/s_fog.c \ swrast/s_imaging.c \ swrast/s_lines.c \ @@ -123,11 +124,27 @@ CORE_SOURCES = \ swrast/s_stencil.c \ swrast/s_texture.c \ swrast/s_triangle.c \ - swrast/s_zoom.c + swrast/s_zoom.c \ + swrast_setup/ss_context.c \ + swrast_setup/ss_triangle.c \ + swrast_setup/ss_vb.c + + DRIVER_SOURCES = \ + FX/fxapi.c \ + FX/fxdd.c \ + FX/fxddspan.c \ + FX/fxddtex.c \ + FX/fxfastpath.c \ + FX/fxpipeline.c \ + FX/fxsetup.c \ + FX/fxtexman.c \ + FX/fxtrifuncs.c \ + FX/fxvsetup.c \ + FX/fxglidew.c \ X/glxapi.c \ X/fakeglx.c \ X/xfonts.c \ @@ -142,20 +159,6 @@ DRIVER_SOURCES = \ SVGA/svgamesa16.c \ SVGA/svgamesa24.c \ SVGA/svgamesa32.c \ - FX/fxapi.c \ - FX/fxclip.c \ - FX/fxdd.c \ - FX/fxddspan.c \ - FX/fxddtex.c \ - FX/fxfastpath.c \ - FX/fxpipeline.c \ - FX/fxrender.c \ - FX/fxsanity.c \ - FX/fxsetup.c \ - FX/fxtexman.c \ - FX/fxtrifuncs.c \ - FX/fxvsetup.c \ - FX/fxglidew.c \ Trace/tr_2string.c \ Trace/tr_attrib.c \ Trace/tr_context.c \ @@ -170,8 +173,8 @@ ASM_SOURCES = ADDITIONAL_OBJ = OBJECTS = $(ASM_SOURCES:.S=.o) \ - $(CORE_SOURCES:.c=.o) \ $(DRIVER_SOURCES:.c=.o) \ + $(CORE_SOURCES:.c=.o) \ $(ADDITIONAL_OBJ) |