fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 15:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make r300 driver build with GL_APPLE_vertex_array_object changes.

Browse source 
Sorry for the breakage.  These changes are only build tested.
This commit is contained in:
Ian Romanick 2006-06-12 22:39:49 +00:00
parent a3feff414f
commit 9853aac495
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/r300/r300_maos.c
View file

@ -621,8 +621,12 @@ void r300UseArrays(GLcontext * ctx)
#ifdef HW_VBOS
#define USE_VBO(a) if (ctx->Array.a.BufferObj->Name && ctx->Array.a.Enabled) \
radeon_mm_use(rmesa, ((struct r300_buffer_object *)ctx->Array.a.BufferObj)->id)
#define USE_VBO(a) \
do { \
if (ctx->Array.ArrayObj->a.BufferObj->Name \
&& ctx->Array.ArrayObj->a.Enabled) \
radeon_mm_use(rmesa, ((struct r300_buffer_object *)ctx->Array.ArrayObj->a.BufferObj)->id); \
} while(0)
if (ctx->Array.ElementArrayBufferObj->Name && ctx->Array.ElementArrayBufferObj->OnCard)
radeon_mm_use(rmesa, ((struct r300_buffer_object *)ctx->Array.ElementArrayBufferObj)->id);

22
src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
View file

@ -84,16 +84,18 @@ void radeon_vb_to_rvb(r300ContextPtr rmesa, struct radeon_vertex_buffer *rvb, st
extern void _tnl_array_init( GLcontext *ctx );
#define CONV(a, b) do { \
if (ctx->Array.b.Enabled) { \
rmesa->state.VB.AttribPtr[(a)].size = ctx->Array.b.Size; \
rmesa->state.VB.AttribPtr[(a)].data = ctx->Array.b.BufferObj->Name ? \
(void *)ADD_POINTERS(ctx->Array.b.Ptr, ctx->Array.b.BufferObj->Data) : (void *)ctx->Array.b.Ptr; \
rmesa->state.VB.AttribPtr[(a)].stride = ctx->Array.b.StrideB; \
rmesa->state.VB.AttribPtr[(a)].type = ctx->Array.b.Type; \
enabled |= 1 << (a); \
} \
} while (0)
#define CONV(a, b) \
do { \
if (ctx->Array.ArrayObj->b.Enabled) { \
rmesa->state.VB.AttribPtr[(a)].size = ctx->Array.ArrayObj->b.Size; \
rmesa->state.VB.AttribPtr[(a)].data = ctx->Array.ArrayObj->b.BufferObj->Name \
? (void *)ADD_POINTERS(ctx->Array.ArrayObj->b.Ptr, ctx->Array.ArrayObj->b.BufferObj->Data) \
: (void *)ctx->Array.ArrayObj->b.Ptr; \
rmesa->state.VB.AttribPtr[(a)].stride = ctx->Array.ArrayObj->b.StrideB; \
rmesa->state.VB.AttribPtr[(a)].type = ctx->Array.ArrayObj->b.Type; \
enabled |= 1 << (a); \
} \
} while (0)
static int setup_arrays(r300ContextPtr rmesa, GLint start)
{