summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl_dd/t_dd_vb.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2003-12-11 16:49:55 +0000
committerKeith Whitwell <[email protected]>2003-12-11 16:49:55 +0000
commit844cdaf461e3e181bcf1d4c0ba79ef5c4140cb4e (patch)
treea9d4a90738093f7108d5195fb349ce384bbd199e /src/mesa/tnl_dd/t_dd_vb.c
parent2dc621f3fdb585f23013aa3e220f2148f9405538 (diff)
Updates to tnl_dd_dmatmp.h
- Allocate vertices explicitly, rather than trying to talk about dma buffers. - Clean up the various Flush() operations. - Don't allow fallbacks any longer. Provide a support function to detect them ahead o ftime Updates to tnl_dd_vbtmp.h - Get rid of power-of-two vertex strides. Pack all vertices tightly. - Get texunit 2,3 emit working coorrectly. Other stuff: - Get rid of lingering Ubyte color support. - Fix a few compiler warnings.
Diffstat (limited to 'src/mesa/tnl_dd/t_dd_vb.c')
-rw-r--r--src/mesa/tnl_dd/t_dd_vb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/tnl_dd/t_dd_vb.c b/src/mesa/tnl_dd/t_dd_vb.c
index 380b0424b4f..edd78f7acfc 100644
--- a/src/mesa/tnl_dd/t_dd_vb.c
+++ b/src/mesa/tnl_dd/t_dd_vb.c
@@ -50,9 +50,9 @@ static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc )
{
LOCALVARS
GLubyte *verts = GET_VERTEX_STORE();
- GLuint shift = GET_VERTEX_STRIDE_SHIFT();
- GLuint *dst = (GLuint *)(verts + (edst << shift));
- GLuint *src = (GLuint *)(verts + (esrc << shift));
+ GLuint size = GET_VERTEX_SIZE();
+ GLuint *dst = (GLuint *)(verts + (edst * size));
+ GLuint *src = (GLuint *)(verts + (esrc * size));
dst[4] = src[4];
dst[5] = src[5];
}
@@ -61,9 +61,9 @@ static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc )
{
LOCALVARS
GLubyte *verts = GET_VERTEX_STORE();
- GLuint shift = GET_VERTEX_STRIDE_SHIFT();
- GLuint *dst = (GLuint *)(verts + (edst << shift));
- GLuint *src = (GLuint *)(verts + (esrc << shift));
+ GLuint size = GET_VERTEX_SIZE();
+ GLuint *dst = (GLuint *)(verts + (edst * size));
+ GLuint *src = (GLuint *)(verts + (esrc * size));
dst[4] = src[4];
}
@@ -71,9 +71,9 @@ static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc )
{
LOCALVARS
GLubyte *verts = GET_VERTEX_STORE();
- GLuint shift = GET_VERTEX_STRIDE_SHIFT();
- GLuint *dst = (GLuint *)(verts + (edst << shift));
- GLuint *src = (GLuint *)(verts + (esrc << shift));
+ GLuint size = GET_VERTEX_SIZE();
+ GLuint *dst = (GLuint *)(verts + (edst * size));
+ GLuint *src = (GLuint *)(verts + (esrc * size));
dst[3] = src[3];
}