s/ProjectedClipPtr/NdcPtr/

This commit is contained in:
Brian Paul
2002-08-21 02:59:00 +00:00
parent 3ac01f5e47
commit b79e99ad60
2 changed files with 13 additions and 13 deletions

View File

@@ -1,8 +1,8 @@
/* $Id: t_dd_vbtmp.h,v 1.18 2002/06/15 02:38:18 brianp Exp $ */ /* $Id: t_dd_vbtmp.h,v 1.19 2002/08/21 02:59:00 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 4.0.3 * Version: 4.1
* *
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* *
@@ -145,8 +145,8 @@ static void TAG(emit)( GLcontext *ctx,
coord_stride = VB->ClipPtr->stride; coord_stride = VB->ClipPtr->stride;
} }
else { else {
coord = VB->ProjectedClipPtr->data; coord = VB->NdcPtr->data;
coord_stride = VB->ProjectedClipPtr->stride; coord_stride = VB->NdcPtr->stride;
} }
if (DO_TEX3) { if (DO_TEX3) {
@@ -417,8 +417,8 @@ static void TAG(emit)( GLcontext *ctx, GLuint start, GLuint end,
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
GLubyte (*col)[4]; GLubyte (*col)[4];
GLuint col_stride; GLuint col_stride;
GLfloat (*coord)[4] = VB->ProjectedClipPtr->data; GLfloat (*coord)[4] = VB->NdcPtr->data;
GLuint coord_stride = VB->ProjectedClipPtr->stride; GLuint coord_stride = VB->NdcPtr->stride;
GLfloat *v = (GLfloat *)dest; GLfloat *v = (GLfloat *)dest;
const GLubyte *mask = VB->ClipMask; const GLubyte *mask = VB->ClipMask;
const GLfloat *s = GET_VIEWPORT_MAT(); const GLfloat *s = GET_VIEWPORT_MAT();
@@ -671,8 +671,8 @@ static void TAG(interp)( GLcontext *ctx,
INTERP_F( t, dst->pv.v0, out->pv.v0, in->pv.v0 ); INTERP_F( t, dst->pv.v0, out->pv.v0, in->pv.v0 );
INTERP_F( t, dst->pv.q0, out->pv.q0, in->pv.q0 ); INTERP_F( t, dst->pv.q0, out->pv.q0, in->pv.q0 );
} else { } else {
GLfloat wout = VB->ProjectedClipPtr->data[eout][3]; GLfloat wout = VB->NdcPtr->data[eout][3];
GLfloat win = VB->ProjectedClipPtr->data[ein][3]; GLfloat win = VB->NdcPtr->data[ein][3];
GLfloat qout = out->pv.w / wout; GLfloat qout = out->pv.w / wout;
GLfloat qin = in->pv.w / win; GLfloat qin = in->pv.w / win;
GLfloat qdst, rqdst; GLfloat qdst, rqdst;

View File

@@ -1,10 +1,10 @@
/* $Id: fxvbtmp.h,v 1.10 2001/09/23 16:50:01 brianp Exp $ */ /* $Id: fxvbtmp.h,v 1.11 2002/08/21 02:59:54 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 4.0 * Version: 4.1
* *
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -41,8 +41,8 @@ static void TAG(emit)( GLcontext *ctx,
GLubyte (*col)[4]; GLubyte (*col)[4];
GLuint tc0_stride, tc1_stride, col_stride; GLuint tc0_stride, tc1_stride, col_stride;
GLuint tc0_size, tc1_size; GLuint tc0_size, tc1_size;
GLfloat (*proj)[4] = VB->ProjectedClipPtr->data; GLfloat (*proj)[4] = VB->NdcPtr->data;
GLuint proj_stride = VB->ProjectedClipPtr->stride; GLuint proj_stride = VB->NdcPtr->stride;
GrVertex *v = (GrVertex *)dest; GrVertex *v = (GrVertex *)dest;
GLfloat u0scale,v0scale,u1scale,v1scale; GLfloat u0scale,v0scale,u1scale,v1scale;
const GLfloat *const s = ctx->Viewport._WindowMap.m; const GLfloat *const s = ctx->Viewport._WindowMap.m;