diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 18:14:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 18:14:41 +0000 |
| commit | 46b0988c673b28e072fd0cbf477632a9ab6f9f18 (patch) | |
| tree | 3463116da957c6f13dcb0b415ca8476640503fc7 /src/mesa/swrast/s_context.h | |
| parent | 2448fc7deeaa870d879de17158f243f239c05b15 (diff) | |
Allow swrast to cope (fairly) cleanly with GL_SEPERATE_SPECULAR when
texturing is not enabled, and without requiring the two colors be
added externally.
As a part of this, collapsed the decomposition of quads into triangles
inside swrast to be hardwired into _swrast_Quad; removed s_quads.[ch].
Removed checks on texture state from t_vb_light.c, which was previously
required by swrast.
Moved the t_dd_ templates to a new directory.
Diffstat (limited to 'src/mesa/swrast/s_context.h')
| -rw-r--r-- | src/mesa/swrast/s_context.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index 86b71ecc45..6603b56e7d 100644 --- a/src/mesa/swrast/s_context.h +++ b/src/mesa/swrast/s_context.h @@ -63,10 +63,6 @@ typedef void (*swrast_line_func)( GLcontext *ctx, typedef void (*swrast_tri_func)( GLcontext *ctx, const SWvertex *, const SWvertex *, const SWvertex *); -typedef void (*swrast_quad_func)( GLcontext *ctx, - const SWvertex *, const SWvertex *, - const SWvertex *, const SWvertex *); - /* @@ -136,12 +132,10 @@ typedef struct void (*choose_point)( GLcontext * ); void (*choose_line)( GLcontext * ); void (*choose_triangle)( GLcontext * ); - void (*choose_quad)( GLcontext * ); GLuint invalidate_point; GLuint invalidate_line; GLuint invalidate_triangle; - GLuint invalidate_quad; /* Function pointers for dispatch behind public entrypoints. @@ -151,7 +145,14 @@ typedef struct swrast_point_func Point; swrast_line_func Line; swrast_tri_func Triangle; - swrast_quad_func Quad; + + /* Placeholders for when seperate specular (or secondary color) is + * enabled but texturing is not. + */ + swrast_point_func SpecPoint; + swrast_line_func SpecLine; + swrast_tri_func SpecTriangle; + /* Internal hooks, kept uptodate by the same mechanism as above. */ |