projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Fix up part of my Sandybridge attributes support patch.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
tdfx
/
tdfx_vb.c
diff --git
a/src/mesa/drivers/dri/tdfx/tdfx_vb.c
b/src/mesa/drivers/dri/tdfx/tdfx_vb.c
index 492880223284224ea4a4b00ea860b0bb21feb446..546d89aa84643bd29ecb0a20bd73e3a0f236c752 100644
(file)
--- a/
src/mesa/drivers/dri/tdfx/tdfx_vb.c
+++ b/
src/mesa/drivers/dri/tdfx/tdfx_vb.c
@@
-29,13
+29,8
@@
#include "main/macros.h"
#include "main/colormac.h"
#include "main/macros.h"
#include "main/colormac.h"
-#include "math/m_translate.h"
-#include "swrast_setup/swrast_setup.h"
-
#include "tdfx_context.h"
#include "tdfx_vb.h"
#include "tdfx_context.h"
#include "tdfx_vb.h"
-#include "tdfx_tris.h"
-#include "tdfx_state.h"
#include "tdfx_render.h"
static void copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )
#include "tdfx_render.h"
static void copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )
@@
-69,11
+64,11
@@
static void interp_extras( GLcontext *ctx,
/*fprintf(stderr, "%s\n", __FUNCTION__);*/
/*fprintf(stderr, "%s\n", __FUNCTION__);*/
- if (VB->
ColorPtr[1]
) {
+ if (VB->
BackfaceColorPtr
) {
INTERP_4F( t,
INTERP_4F( t,
-
GET_COLOR(VB->ColorPtr[1]
, dst),
-
GET_COLOR(VB->ColorPtr[1]
, out),
-
GET_COLOR(VB->ColorPtr[1]
, in) );
+
GET_COLOR(VB->BackfaceColorPtr
, dst),
+
GET_COLOR(VB->BackfaceColorPtr
, out),
+
GET_COLOR(VB->BackfaceColorPtr
, in) );
}
if (VB->EdgeFlag) {
}
if (VB->EdgeFlag) {
@@
-88,9
+83,9
@@
static void copy_pv_extras( GLcontext *ctx, GLuint dst, GLuint src )
{
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
{
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
- if (VB->
ColorPtr[1]
) {
- COPY_4FV( GET_COLOR(VB->ColorPtr[1], dst),
-
GET_COLOR(VB->ColorPtr[1]
, src) );
+ if (VB->
BackfaceColorPtr
) {
+ COPY_4FV( GET_COLOR(VB->BackfaceColorPtr, dst),
+
GET_COLOR(VB->BackfaceColorPtr
, src) );
}
setup_tab[TDFX_CONTEXT(ctx)->SetupIndex].copy_pv(ctx, dst, src);
}
setup_tab[TDFX_CONTEXT(ctx)->SetupIndex].copy_pv(ctx, dst, src);
@@
-336,7
+331,7
@@
void tdfxInitVB( GLcontext *ctx )
firsttime = 0;
}
firsttime = 0;
}
- fxMesa->verts =
ALIGN_MALLOC
(size * sizeof(tdfxVertex), 32);
+ fxMesa->verts =
_mesa_align_malloc
(size * sizeof(tdfxVertex), 32);
fxMesa->vertexFormat = TDFX_LAYOUT_TINY;
fxMesa->SetupIndex = TDFX_XYZ_BIT|TDFX_RGBA_BIT;
}
fxMesa->vertexFormat = TDFX_LAYOUT_TINY;
fxMesa->SetupIndex = TDFX_XYZ_BIT|TDFX_RGBA_BIT;
}
@@
-346,7
+341,7
@@
void tdfxFreeVB( GLcontext *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
if (fxMesa->verts) {
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
if (fxMesa->verts) {
-
ALIGN_FREE
(fxMesa->verts);
+
_mesa_align_free
(fxMesa->verts);
fxMesa->verts = 0;
}
}
fxMesa->verts = 0;
}
}