-/* -*- mode: c; c-basic-offset: 3 -*-
- *
- * Copyright 2000 VA Linux Systems Inc., Fremont, California.
+/* $Id: fxtris.c,v 1.20 2002/10/24 23:57:23 brianp Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version: 4.0
*
- * All Rights Reserved.
+ * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * VA LINUX SYSTEMS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/lib/GL/mesa/src/drv/fx/fxtris.c,v 1.5 2000/09/24 13:51:04 alanh Exp $ */
/* Authors:
* Keith Whitwell <keithw@valinux.com>
*/
-#include <stdio.h>
-#include <math.h>
+#include "glheader.h"
#ifdef FX
-#include "glheader.h"
#include "mtypes.h"
#include "macros.h"
#include "colormac.h"
{
GLcontext *ctx = fxMesa->glCtx;
SWvertex v[3];
+
fx_translate_vertex( ctx, v0, &v[0] );
fx_translate_vertex( ctx, v1, &v[1] );
fx_translate_vertex( ctx, v2, &v[2] );
static void fx_print_vertex( GLcontext *ctx, const GrVertex *v )
{
- fprintf(stderr, "vertex at %p\n", v);
+ fprintf(stderr, "vertex at %p\n", (void *) v);
fprintf(stderr, "x %f y %f z %f oow %f\n",
v->x, v->y, v->ooz, v->oow);
do { \
color[idx][0] = v[idx]->r; \
color[idx][1] = v[idx]->g; \
- color[idx][1] = v[idx]->b; \
+ color[idx][2] = v[idx]->b; \
color[idx][3] = v[idx]->a; \
} while (0)
GrVertex *vertptr = fxMesa->verts;
const GrVertex *start = VERT(elts[0]);
int i;
-
for (i = 2 ; i < n ; i++) {
grDrawTriangle( start, VERT(elts[i-1]), VERT(elts[i]) );
}
#define POINT_FALLBACK (DD_POINT_SMOOTH)
#define LINE_FALLBACK (DD_LINE_STIPPLE)
-#define TRI_FALLBACK (DD_TRI_SMOOTH)
-#define ANY_FALLBACK_FLAGS (POINT_FALLBACK|LINE_FALLBACK|TRI_FALLBACK|DD_TRI_STIPPLE)
-#define ANY_RASTER_FLAGS (DD_FLATSHADE|DD_TRI_LIGHT_TWOSIDE|DD_TRI_OFFSET| \
- DD_TRI_UNFILLED)
+#define TRI_FALLBACK (DD_TRI_SMOOTH | DD_TRI_STIPPLE)
+#define ANY_FALLBACK_FLAGS (POINT_FALLBACK | LINE_FALLBACK | TRI_FALLBACK)
+#define ANY_RASTER_FLAGS (DD_FLATSHADE | DD_TRI_LIGHT_TWOSIDE | DD_TRI_OFFSET \
+ | DD_TRI_UNFILLED)
-static void fxChooseRenderState(GLcontext *ctx)
+void fxDDChooseRenderState(GLcontext *ctx)
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
fxMesaContext fxMesa = FX_CONTEXT(ctx);
if (flags & LINE_FALLBACK)
fxMesa->draw_line = fx_fallback_line;
- if (flags & TRI_FALLBACK)
+ if (flags & TRI_FALLBACK) {
+/* fprintf(stderr, "tri fallback\n"); */
fxMesa->draw_tri = fx_fallback_tri;
+ }
index |= FX_FALLBACK_BIT;
}
}
+/* fprintf(stderr, "render index %x\n", index); */
+
tnl->Driver.Render.Points = rast_tab[index].points;
tnl->Driver.Render.Line = rast_tab[index].line;
tnl->Driver.Render.ClippedLine = rast_tab[index].line;
tnl->Driver.Render.PrimTabVerts = fx_render_tab_verts;
tnl->Driver.Render.PrimTabElts = fx_render_tab_elts;
tnl->Driver.Render.ClippedPolygon = fxFastRenderClippedPoly;
+
+ tnl->Driver.Render.ClippedPolygon = fxRenderClippedPoly;
+
} else {
tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
}
}
+
/**********************************************************************/
/* Runtime render state and callbacks */
/**********************************************************************/
GLuint oldfallback = !fxMesa->is_in_hardware;
GLuint newfallback;
- fxMesa->is_in_hardware = check_IsInHardware( ctx );
+ fxMesa->is_in_hardware = fx_check_IsInHardware( ctx );
newfallback = !fxMesa->is_in_hardware;
if (newfallback) {
if (oldfallback == 0) {
+/* fprintf(stderr, "goint to fallback\n"); */
_swsetup_Wakeup( ctx );
}
}
else {
if (oldfallback) {
+/* fprintf(stderr, "leaving fallback\n"); */
_swrast_flush( ctx );
tnl->Driver.Render.Start = fxCheckTexSizes;
tnl->Driver.Render.Finish = _swrast_flush;
tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
tnl->Driver.Render.BuildVertices = fxBuildVertices;
tnl->Driver.Render.Multipass = 0;
- fxDDChooseSetupState(ctx);
+ fxChooseVertexState(ctx);
fxDDChooseRenderState(ctx);
}
}
void fxDDInitTriFuncs( GLcontext *ctx )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
- fxMesaContext fxMesa = FX_CONTEXT(ctx);
static int firsttime = 1;
if (firsttime) {
(void) fx_print_vertex;
}
+
#else
projects / mesa.git / blobdiff