diff options
| author | Ben Crossman <bencrossman@freedesktop.org> | 2005-04-14 16:58:25 +0000 |
|---|---|---|
| committer | Ben Crossman <bencrossman@freedesktop.org> | 2005-04-14 16:58:25 +0000 |
| commit | b2b01a60dbba4ebd130898509c14ca80a847a679 (patch) | |
| tree | 2e82d913496c2d9568fc15813deed2a532500158 /src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c | |
| parent | 60e2810ae45b358699e6db0ddc95e0a4c1f45338 (diff) | |
Some initial compile fixes. Still some left and warnings that need fixing. No where near runnable yet.
Diffstat (limited to 'src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c')
| -rw-r--r-- | src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c index f19f2a5eaa..9a55d352b2 100644 --- a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c +++ b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c @@ -51,7 +51,7 @@ #include "macros.h" // #include "mem.h" #include "mtypes.h" -#include "mmath.h" +//#include "mmath.h" #include "math/m_matrix.h" #include "math/m_xform.h" @@ -117,7 +117,7 @@ __inline void _gldSetVertexShaderConstants( static GLboolean gld_d3d_render_stage_run( GLcontext *ctx, - struct gl_pipeline_stage *stage) + struct tnl_pipeline_stage *stage) { GLD_context *gldCtx = GLD_GET_CONTEXT(ctx); GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx); @@ -199,11 +199,11 @@ static GLboolean gld_d3d_render_stage_run( do { GLuint i, length, flags = 0; - for (i = 0 ; !(flags & PRIM_LAST) ; i += length) + for (i = 0 ; !(flags & PRIM_END) ; i += length) { - flags = VB->Primitive[i]; - length= VB->PrimitiveLength[i]; - ASSERT(length || (flags & PRIM_LAST)); + flags = VB->Primitive[i].mode; + length= VB->Primitive[i].count; + ASSERT(length || (flags & PRIM_END)); ASSERT((flags & PRIM_MODE_MASK) <= GL_POLYGON+1); if (length) tab[flags & PRIM_MODE_MASK]( ctx, i, i + length, flags ); @@ -240,7 +240,7 @@ static GLboolean gld_d3d_render_stage_run( static void gld_d3d_render_stage_check( GLcontext *ctx, - struct gl_pipeline_stage *stage) + struct tnl_pipeline_stage *stage) { GLD_context *gldCtx = GLD_GET_CONTEXT(ctx); GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx); @@ -251,13 +251,13 @@ static void gld_d3d_render_stage_check( //--------------------------------------------------------------------------- -static void gld_d3d_render_stage_dtr( struct gl_pipeline_stage *stage ) +static void gld_d3d_render_stage_dtr( struct tnl_pipeline_stage *stage ) { } //--------------------------------------------------------------------------- -const struct gl_pipeline_stage _gld_d3d_render_stage = +const struct tnl_pipeline_stage _gld_d3d_render_stage = { "gld_d3d_render_stage", (_NEW_BUFFERS | |