fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-02 04:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r200: cleanup some bits that aren't used

Browse source
This commit is contained in:
Dave Airlie 2009-02-09 03:50:07 +10:00
parent e223b7c312
commit abdf1f65d2
4 changed files with 2 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/r200/r200_context.h
View file

@ -535,7 +535,6 @@ struct r200_tcl_info {
/* hw can handle 12 components max */
struct radeon_aos aos[12];
// struct radeon_dma_region *aos_components[12];
GLuint nr_aos_components;
GLuint *Elts;
@ -544,7 +543,6 @@ struct r200_tcl_info {
int elt_dma_offset; /** Offset into this buffer object, in bytes */
int elt_used;
struct radeon_dma_region vertex_data[15];
};

26
src/mesa/drivers/dri/r200/r200_ioctl.h
View file

@ -63,32 +63,6 @@ extern GLushort *r200AllocEltsOpenEnded( r200ContextPtr rmesa,
extern void r200EmitAOS(r200ContextPtr rmesa, GLuint nr, GLuint offset);
extern void r200EmitBlit( r200ContextPtr rmesa,
GLuint color_fmt,
GLuint src_pitch,
GLuint src_offset,
GLuint dst_pitch,
GLuint dst_offset,
GLint srcx, GLint srcy,
GLint dstx, GLint dsty,
GLuint w, GLuint h );
extern void r200EmitWait( r200ContextPtr rmesa, GLuint flags );
//extern void r200FlushCmdBuf( r200ContextPtr rmesa, const char * );
//extern int r200FlushCmdBufLocked( r200ContextPtr rmesa, const char * caller );
extern void r200RefillCurrentDmaRegion( r200ContextPtr rmesa );
extern void r200AllocDmaRegion( r200ContextPtr rmesa,
struct radeon_dma_region *region,
int bytes,
int alignment );
extern void r200ReleaseDmaRegion( r200ContextPtr rmesa,
struct radeon_dma_region *region,
const char *caller );
extern void r200Flush( GLcontext *ctx );
extern void r200Finish( GLcontext *ctx );
extern void r200InitIoctlFuncs( struct dd_function_table *functions );

6
src/mesa/drivers/dri/r200/r200_maos_arrays.c
View file

@ -105,7 +105,6 @@ void r200EmitArrays( GLcontext *ctx, GLubyte *vimap_rev )
{
r200ContextPtr rmesa = R200_CONTEXT( ctx );
struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
// struct radeon_dma_region **component = rmesa->tcl.aos_components;
GLuint nr = 0;
GLuint vfmt0 = 0, vfmt1 = 0;
GLuint count = VB->Count;
@ -143,7 +142,7 @@ void r200EmitArrays( GLcontext *ctx, GLubyte *vimap_rev )
case 3:
/* special handling to fix up fog. Will get us into trouble with vbos...*/
assert(attrib == VERT_ATTRIB_FOG);
if (!rmesa->tcl.vertex_data[i].buf) {
if (!rmesa->tcl.aos[i].bo) {
if (ctx->VertexProgram._Enabled)
rcommon_emit_vector( ctx,
&(rmesa->tcl.aos[nr]),
@ -200,7 +199,7 @@ void r200EmitArrays( GLcontext *ctx, GLubyte *vimap_rev )
default:
assert(0);
}
if (!rmesa->tcl.vertex_data[i].buf) {
if (!rmesa->tcl.aos[nr].bo) {
rcommon_emit_vector( ctx,
&(rmesa->tcl.aos[nr]),
(char *)VB->AttribPtr[attrib]->data,
@ -211,7 +210,6 @@ void r200EmitArrays( GLcontext *ctx, GLubyte *vimap_rev )
after_emit:
assert(nr < 12);
nr++;
// component[nr++] = &rmesa->tcl.vertex_data[i];
}
}

1
src/mesa/drivers/dri/r200/r200_tcl.c
View file

@ -142,7 +142,6 @@ static GLboolean discrete_prim[0x10] = {
static GLushort *r200AllocElts( r200ContextPtr rmesa, GLuint nr )
{
// fprintf(stderr,"alloc elts %d %d\n", nr, rmesa->tcl.elt_used);
if (rmesa->radeon.dma.flush == r200FlushElts &&
rmesa->tcl.elt_used + nr*2 < R200_ELT_BUF_SZ) {