diff options
| author | Keith Whitwell <[email protected]> | 2000-11-16 21:05:34 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2000-11-16 21:05:34 +0000 |
| commit | 23caf20169ac38436ee9c13914f1d6aa7cf6bb5e (patch) | |
| tree | 21307f7bbcaf9ee1e841d7e7bee130570a7b5b95 /src/mesa/swrast | |
| parent | 179516673211a2350e479d5321840291f339f5dd (diff) | |
Move the transform and lighting code to two new directories
math: Provides basic matrix and vector functionality that
might be useful to multiple software t&l
implementations, and is used by core mesa to
manage the Model, Project, etc matrices.
tnl: The real transform & lighting code from core mesa,
including everything from glVertex3f through vertex
buffer handling, transformation, clipping, lighting
and handoff to a driver for rasterization.
The interfaces of these can be further tightened up, but the basic
splitting up of state and code move is done.
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_bitmap.c | 7 | ||||
| -rw-r--r-- | src/mesa/swrast/s_lines.c | 3 | ||||
| -rw-r--r-- | src/mesa/swrast/s_points.c | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index f11186baedf..c5f4127c2e2 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -1,4 +1,4 @@ -/* $Id: s_bitmap.c,v 1.2 2000/11/05 18:24:40 keithw Exp $ */ +/* $Id: s_bitmap.c,v 1.3 2000/11/16 21:05:41 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -56,11 +56,6 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, if (SWRAST_CONTEXT(ctx)->NewState) _swrast_validate_derived( ctx ); - if (PB->primitive != GL_BITMAP) { - gl_flush_pb( ctx ); - PB->primitive = GL_BITMAP; - } - /* Set bitmap drawing color */ if (ctx->Visual.RGBAflag) { GLint r, g, b, a; diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c index e460a77f181..a16fe9ecf8a 100644 --- a/src/mesa/swrast/s_lines.c +++ b/src/mesa/swrast/s_lines.c @@ -1,4 +1,4 @@ -/* $Id: s_lines.c,v 1.5 2000/11/13 20:02:57 keithw Exp $ */ +/* $Id: s_lines.c,v 1.6 2000/11/16 21:05:41 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -28,7 +28,6 @@ #include "glheader.h" #include "macros.h" #include "mmath.h" -#include "vb.h" #include "s_aaline.h" #include "s_pb.h" #include "s_context.h" diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c index 5c30c5f5a21..e6f193f5558 100644 --- a/src/mesa/swrast/s_points.c +++ b/src/mesa/swrast/s_points.c @@ -1,4 +1,4 @@ -/* $Id: s_points.c,v 1.5 2000/11/15 16:38:40 brianp Exp $ */ +/* $Id: s_points.c,v 1.6 2000/11/16 21:05:41 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -30,7 +30,6 @@ #include "macros.h" #include "mmath.h" #include "texstate.h" -#include "vb.h" #include "s_context.h" #include "s_feedback.h" |