From: Brian Paul Date: Wed, 21 Aug 2002 02:59:00 +0000 (+0000) Subject: s/ProjectedClipPtr/NdcPtr/ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b79e99ad6047c18f28b65c6b027ee703f5042918;p=mesa.git s/ProjectedClipPtr/NdcPtr/ --- diff --git a/src/mesa/drivers/common/t_dd_vbtmp.h b/src/mesa/drivers/common/t_dd_vbtmp.h index d88318c16b3..c8b82ec2c47 100644 --- a/src/mesa/drivers/common/t_dd_vbtmp.h +++ b/src/mesa/drivers/common/t_dd_vbtmp.h @@ -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 - * Version: 4.0.3 + * Version: 4.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * @@ -145,8 +145,8 @@ static void TAG(emit)( GLcontext *ctx, coord_stride = VB->ClipPtr->stride; } else { - coord = VB->ProjectedClipPtr->data; - coord_stride = VB->ProjectedClipPtr->stride; + coord = VB->NdcPtr->data; + coord_stride = VB->NdcPtr->stride; } 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; GLubyte (*col)[4]; GLuint col_stride; - GLfloat (*coord)[4] = VB->ProjectedClipPtr->data; - GLuint coord_stride = VB->ProjectedClipPtr->stride; + GLfloat (*coord)[4] = VB->NdcPtr->data; + GLuint coord_stride = VB->NdcPtr->stride; GLfloat *v = (GLfloat *)dest; const GLubyte *mask = VB->ClipMask; 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.q0, out->pv.q0, in->pv.q0 ); } else { - GLfloat wout = VB->ProjectedClipPtr->data[eout][3]; - GLfloat win = VB->ProjectedClipPtr->data[ein][3]; + GLfloat wout = VB->NdcPtr->data[eout][3]; + GLfloat win = VB->NdcPtr->data[ein][3]; GLfloat qout = out->pv.w / wout; GLfloat qin = in->pv.w / win; GLfloat qdst, rqdst; diff --git a/src/mesa/drivers/glide/fxvbtmp.h b/src/mesa/drivers/glide/fxvbtmp.h index 3540fa06ffe..b6be3ecd9f3 100644 --- a/src/mesa/drivers/glide/fxvbtmp.h +++ b/src/mesa/drivers/glide/fxvbtmp.h @@ -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 - * 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 * copy of this software and associated documentation files (the "Software"), @@ -41,8 +41,8 @@ static void TAG(emit)( GLcontext *ctx, GLubyte (*col)[4]; GLuint tc0_stride, tc1_stride, col_stride; GLuint tc0_size, tc1_size; - GLfloat (*proj)[4] = VB->ProjectedClipPtr->data; - GLuint proj_stride = VB->ProjectedClipPtr->stride; + GLfloat (*proj)[4] = VB->NdcPtr->data; + GLuint proj_stride = VB->NdcPtr->stride; GrVertex *v = (GrVertex *)dest; GLfloat u0scale,v0scale,u1scale,v1scale; const GLfloat *const s = ctx->Viewport._WindowMap.m;