From 957b7343228e28d62a1c1e96903bb2a0b74dec20 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Fri, 28 May 2004 14:50:36 +0000 Subject: remove never finished verts path (r200_maos_vbtmp.h, r200_maos_verts.c) and unused R200_OLD_PACKET macro --- src/mesa/drivers/dri/r200/r200_context.h | 2 - src/mesa/drivers/dri/r200/r200_maos.c | 7 +- src/mesa/drivers/dri/r200/r200_maos_vbtmp.h | 378 ---------------------------- src/mesa/drivers/dri/r200/r200_maos_verts.c | 334 ------------------------ 4 files changed, 4 insertions(+), 717 deletions(-) delete mode 100644 src/mesa/drivers/dri/r200/r200_maos_vbtmp.h delete mode 100644 src/mesa/drivers/dri/r200/r200_maos_verts.c (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h index aa3e8dad91..78631c722a 100644 --- a/src/mesa/drivers/dri/r200/r200_context.h +++ b/src/mesa/drivers/dri/r200/r200_context.h @@ -932,8 +932,6 @@ static __inline GLuint r200PackColor( GLuint cpp, } } -#define R200_OLD_PACKETS 0 - extern void r200DestroyContext( __DRIcontextPrivate *driContextPriv ); extern GLboolean r200CreateContext( const __GLcontextModes *glVisual, diff --git a/src/mesa/drivers/dri/r200/r200_maos.c b/src/mesa/drivers/dri/r200/r200_maos.c index a97736457f..23e1c962a1 100644 --- a/src/mesa/drivers/dri/r200/r200_maos.c +++ b/src/mesa/drivers/dri/r200/r200_maos.c @@ -1,13 +1,14 @@ -/* If using new packets, can choose either verts or arrays. - * Otherwise, must use verts. +/* Currently, can only use arrays, verts are not implemented, though + * verts are suspected to be faster. + * To get an idea how the verts path works, look at the radeon implementation. */ #include #include "r200_context.h" #define R200_MAOS_VERTS 0 -#if (R200_MAOS_VERTS) || (R200_OLD_PACKETS) +#if (R200_MAOS_VERTS) #include "r200_maos_verts.c" #else #include "r200_maos_arrays.c" diff --git a/src/mesa/drivers/dri/r200/r200_maos_vbtmp.h b/src/mesa/drivers/dri/r200/r200_maos_vbtmp.h deleted file mode 100644 index ce258d7988..0000000000 --- a/src/mesa/drivers/dri/r200/r200_maos_vbtmp.h +++ /dev/null @@ -1,378 +0,0 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_maos_vbtmp.h,v 1.2 2002/12/16 16:18:54 dawes Exp $ */ -/* -Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. - -The Weather Channel (TM) funded Tungsten Graphics to develop the -initial release of the Radeon 8500 driver under the XFree86 license. -This notice must be preserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial -portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -/* - * Authors: - * Keith Whitwell - */ - -#ifndef LOCALVARS -#define LOCALVARS -#endif - -#undef TCL_DEBUG -#ifndef TCL_DEBUG -#define TCL_DEBUG 0 -#endif - -static void TAG(emit)( GLcontext *ctx, - GLuint start, GLuint end, - void *dest ) -{ - LOCALVARS - struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; - GLuint (*tc0)[4], (*tc1)[4]; - GLfloat *fog; - GLuint (*tc2)[4], (*norm)[3]; - GLubyte (*col)[4], (*spec)[4]; - GLuint tc0_stride, tc1_stride, col_stride, spec_stride, fog_stride; - GLuint tc2_stride, norm_stride; - GLuint (*coord)[4]; - GLuint coord_stride; - GLubyte dummy[4]; - int i; - - union emit_union *v = (union emit_union *)dest; - - - if (R200_DEBUG & DEBUG_VERTS) - fprintf(stderr, "%s\n", __FUNCTION__); - - /* The vertex code expects Obj to be clean to element 3. To fix - * this, add more vertex code (for obj-2, obj-3) or preferably move - * to maos. - */ - if (VB->ObjPtr->size < 3) { - if (VB->ObjPtr->flags & VEC_NOT_WRITEABLE) { - VB->import_data( ctx, VERT_OBJ, VEC_NOT_WRITEABLE ); - } - _mesa_vector4f_clean_elem( VB->ObjPtr, VB->Count, 2 ); - } - - if (DO_W && VB->ObjPtr->size < 4) { - if (VB->ObjPtr->flags & VEC_NOT_WRITEABLE) { - VB->import_data( ctx, VERT_OBJ, VEC_NOT_WRITEABLE ); - } - _mesa_vector4f_clean_elem( VB->ObjPtr, VB->Count, 3 ); - } - - coord = (GLuint (*)[4])VB->ObjPtr->data; - coord_stride = VB->ObjPtr->stride; - - if (DO_TEX2) { - const GLuint t2 = GET_TEXSOURCE(2); - tc2 = (GLuint (*)[4])VB->TexCoordPtr[t2]->data; - tc2_stride = VB->TexCoordPtr[t2]->stride; - if (DO_PTEX && VB->TexCoordPtr[t2]->size < 4) { - if (VB->TexCoordPtr[t2]->flags & VEC_NOT_WRITEABLE) { - VB->import_data( ctx, VERT_TEX2, VEC_NOT_WRITEABLE ); - } - _mesa_vector4f_clean_elem( VB->TexCoordPtr[t2], VB->Count, 3 ); - } - } - - if (DO_TEX1) { - if (VB->TexCoordPtr[1]) { - const GLuint t1 = GET_TEXSOURCE(1); - tc1 = (GLuint (*)[4])VB->TexCoordPtr[t1]->data; - tc1_stride = VB->TexCoordPtr[t1]->stride; - if (DO_PTEX && VB->TexCoordPtr[t1]->size < 4) { - if (VB->TexCoordPtr[t1]->flags & VEC_NOT_WRITEABLE) { - VB->import_data( ctx, VERT_TEX1, VEC_NOT_WRITEABLE ); - } - _mesa_vector4f_clean_elem( VB->TexCoordPtr[t1], VB->Count, 3 ); - } - } else { - tc1 = (GLuint (*)[4])&ctx->Current.Texcoord[1]; /* could be anything, really */ - tc1_stride = 0; - } - } - - if (DO_TEX0) { - if (VB->TexCoordPtr[0]) { - const GLuint t0 = GET_TEXSOURCE(0); - tc0_stride = VB->TexCoordPtr[t0]->stride; - tc0 = (GLuint (*)[4])VB->TexCoordPtr[t0]->data; - if (DO_PTEX && VB->TexCoordPtr[t0]->size < 4) { - if (VB->TexCoordPtr[t0]->flags & VEC_NOT_WRITEABLE) { - VB->import_data( ctx, VERT_TEX0, VEC_NOT_WRITEABLE ); - } - _mesa_vector4f_clean_elem( VB->TexCoordPtr[t0], VB->Count, 3 ); - } - } else { - tc0 = (GLuint (*)[4])&ctx->Current.Texcoord[0]; /* could be anything, really */ - tc0_stride = 0; - } - - } - - if (DO_NORM) { - if (VB->NormalPtr) { - norm_stride = VB->NormalPtr->stride; - norm = (GLuint (*)[3])VB->NormalPtr->data; - } else { - norm_stride = 0; - norm = (GLuint (*)[3])&ctx->Current.Normal; - } - } - - if (DO_RGBA) { - if (VB->ColorPtr[0]) { - /* This is incorrect when colormaterial is enabled: - */ - if (VB->ColorPtr[0]->Type != GL_UNSIGNED_BYTE) { - if (0) fprintf(stderr, "IMPORTING FLOAT COLORS\n"); - IMPORT_FLOAT_COLORS( ctx ); - } - col = (GLubyte (*)[4])VB->ColorPtr[0]->Ptr; - col_stride = VB->ColorPtr[0]->StrideB; - } else { - col = &dummy; /* any old memory is fine */ - col_stride = 0; - } - - } - - if (DO_SPEC) { - if (VB->SecondaryColorPtr[0]) { - if (VB->SecondaryColorPtr[0]->Type != GL_UNSIGNED_BYTE) - IMPORT_FLOAT_SPEC_COLORS( ctx ); - spec = (GLubyte (*)[4])VB->SecondaryColorPtr[0]->Ptr; - spec_stride = VB->SecondaryColorPtr[0]->StrideB; - } else { - spec = &dummy; - spec_stride = 0; - } - - } - - if (DO_FOG) { - if (VB->FogCoordPtr) { - fog = VB->FogCoordPtr->data; - fog_stride = VB->FogCoordPtr->stride; - } else { - fog = (GLfloat *)&dummy; *fog = 0; - fog_stride = 0; - } - - } - - - if (VB->importable_data) { - if (start) { - coord = (GLuint (*)[4])((GLubyte *)coord + start * coord_stride); - if (DO_TEX0) - tc0 = (GLuint (*)[4])((GLubyte *)tc0 + start * tc0_stride); - if (DO_TEX1) - tc1 = (GLuint (*)[4])((GLubyte *)tc1 + start * tc1_stride); - if (DO_TEX2) - tc2 = (GLuint (*)[4])((GLubyte *)tc2 + start * tc2_stride); - if (DO_NORM) - norm = (GLuint (*)[3])((GLubyte *)norm + start * norm_stride); - if (DO_RGBA) - STRIDE_4UB(col, start * col_stride); - if (DO_SPEC) - STRIDE_4UB(spec, start * spec_stride); - if (DO_FOG) - STRIDE_F(fog, start * fog_stride); - } - - for (i=start; i < end; i++) { - v[0].ui = coord[0][0]; - v[1].ui = coord[0][1]; - v[2].ui = coord[0][2]; - if (TCL_DEBUG) fprintf(stderr, "%d: %.2f %.2f %.2f ", i, v[0].f, v[1].f, v[2].f); - if (DO_W) { - v[3].ui = coord[0][3]; - if (TCL_DEBUG) fprintf(stderr, "%.2f ", v[3].f); - v += 4; - } - else - v += 3; - coord = (GLuint (*)[4])((GLubyte *)coord + coord_stride); - - if (DO_NORM) { - v[0].ui = norm[0][0]; - v[1].ui = norm[0][1]; - v[2].ui = norm[0][2]; - if (TCL_DEBUG) fprintf(stderr, "norm: %.2f %.2f %.2f ", v[0].f, v[1].f, v[2].f); - v += 3; - norm = (GLuint (*)[3])((GLubyte *)norm + norm_stride); - } - if (DO_RGBA) { - v[0].ui = LE32_TO_CPU(*(GLuint *)&col[0]); - STRIDE_4UB(col, col_stride); - if (TCL_DEBUG) fprintf(stderr, "%x ", v[0].ui); - v++; - } - if (DO_SPEC || DO_FOG) { - if (DO_SPEC) { - v[0].ub[0] = spec[0][0]; - v[0].ub[1] = spec[0][1]; - v[0].ub[2] = spec[0][2]; - STRIDE_4UB(spec, spec_stride); - } - if (DO_FOG) { - v[0].ub[3] = fog[0] * 255.0; - STRIDE_F(fog, fog_stride); - } - if (TCL_DEBUG) fprintf(stderr, "%x ", v[0].ui); - v++; - } - if (DO_TEX0) { - v[0].ui = tc0[0][0]; - v[1].ui = tc0[0][1]; - if (TCL_DEBUG) fprintf(stderr, "t0: %.2f %.2f ", v[0].f, v[1].f); - if (DO_PTEX) { - v[2].ui = tc0[0][3]; - if (TCL_DEBUG) fprintf(stderr, "%.2f ", v[2].f); - v += 3; - } - else - v += 2; - tc0 = (GLuint (*)[4])((GLubyte *)tc0 + tc0_stride); - } - if (DO_TEX1) { - v[0].ui = tc1[0][0]; - v[1].ui = tc1[0][1]; - if (TCL_DEBUG) fprintf(stderr, "t1: %.2f %.2f ", v[0].f, v[1].f); - if (DO_PTEX) { - v[2].ui = tc1[0][3]; - if (TCL_DEBUG) fprintf(stderr, "%.2f ", v[2].f); - v += 3; - } - else - v += 2; - tc1 = (GLuint (*)[4])((GLubyte *)tc1 + tc1_stride); - } - if (DO_TEX2) { - v[0].ui = tc2[0][0]; - v[1].ui = tc2[0][1]; - if (DO_PTEX) { - v[2].ui = tc2[0][3]; - v += 3; - } - else - v += 2; - tc2 = (GLuint (*)[4])((GLubyte *)tc2 + tc2_stride); - } - if (TCL_DEBUG) fprintf(stderr, "\n"); - } - } else { - for (i=start; i < end; i++) { - v[0].ui = coord[i][0]; - v[1].ui = coord[i][1]; - v[2].ui = coord[i][2]; - if (DO_W) { - v[3].ui = coord[i][3]; - v += 4; - } - else - v += 3; - - if (DO_NORM) { - v[0].ui = norm[i][0]; - v[1].ui = norm[i][1]; - v[2].ui = norm[i][2]; - v += 3; - } - if (DO_RGBA) { - v[0].ui = LE32_TO_CPU(*(GLuint *)&col[i]); - v++; - } - if (DO_SPEC || DO_FOG) { - if (DO_SPEC) { - v[0].ub[0] = spec[i][0]; - v[0].ub[1] = spec[i][1]; - v[0].ub[2] = spec[i][2]; - } - if (DO_FOG) { - v[0].ub[3] = fog[i] * 255.0; - } - v++; - } - if (DO_TEX0) { - v[0].ui = tc0[i][0]; - v[1].ui = tc0[i][1]; - if (DO_PTEX) { - v[2].ui = tc0[i][3]; - v += 3; - } - else - v += 2; - } - if (DO_TEX1) { - v[0].ui = tc1[i][0]; - v[1].ui = tc1[i][1]; - if (DO_PTEX) { - v[2].ui = tc1[i][3]; - v += 3; - } - else - v += 2; - } - if (DO_TEX2) { - v[0].ui = tc2[i][0]; - v[1].ui = tc2[i][1]; - if (DO_PTEX) { - v[2].ui = tc2[i][3]; - v += 3; - } - else - v += 2; - } - } - } -} - - - -static void TAG(init)( void ) -{ - int sz = 3; - if (DO_W) sz++; - if (DO_NORM) sz += 3; - if (DO_RGBA) sz++; - if (DO_SPEC || DO_FOG) sz++; - if (DO_TEX0) sz += 2; - if (DO_TEX0 && DO_PTEX) sz++; - if (DO_TEX1) sz += 2; - if (DO_TEX1 && DO_PTEX) sz++; - if (DO_TEX2) sz += 2; - if (DO_TEX2 && DO_PTEX) sz++; - - setup_tab[IDX].emit = TAG(emit); - setup_tab[IDX].vertex_format = IND; - setup_tab[IDX].vertex_size = sz; -} - - -#undef IND -#undef TAG -#undef IDX diff --git a/src/mesa/drivers/dri/r200/r200_maos_verts.c b/src/mesa/drivers/dri/r200/r200_maos_verts.c deleted file mode 100644 index d7429ca76e..0000000000 --- a/src/mesa/drivers/dri/r200/r200_maos_verts.c +++ /dev/null @@ -1,334 +0,0 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_maos_verts.c,v 1.1 2002/10/30 12:51:52 alanh Exp $ */ -/* -Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. - -The Weather Channel (TM) funded Tungsten Graphics to develop the -initial release of the Radeon 8500 driver under the XFree86 license. -This notice must be preserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial -portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Keith Whitwell - */ - -#include "glheader.h" -#include "imports.h" -#include "mmath.h" -#include "mtypes.h" -#include "enums.h" -#include "colormac.h" -#include "light.h" - -#include "array_cache/acache.h" -#include "tnl/tnl.h" -#include "tnl/t_pipeline.h" -#include "tnl/t_imm_debug.h" - -#include "r200_context.h" -#include "r200_state.h" -#include "r200_ioctl.h" -#include "r200_tex.h" -#include "r200_tcl.h" -#include "r200_swtcl.h" -#include "r200_maos.h" - - -#define R200_TCL_MAX_SETUP 13 - -union emit_union { float f; GLuint ui; GLubyte ub[4]; }; - -static struct { - void (*emit)( GLcontext *, GLuint, GLuint, void * ); - GLuint vertex_size; - GLuint vertex_format; -} setup_tab[R200_TCL_MAX_SETUP]; - -#define DO_W (IND & R200_CP_VC_FRMT_W0) -#define DO_RGBA (IND & R200_CP_VC_FRMT_PKCOLOR) -#define DO_SPEC (IND & R200_CP_VC_FRMT_PKSPEC) -#define DO_FOG (IND & R200_CP_VC_FRMT_PKSPEC) -#define DO_TEX0 (IND & R200_CP_VC_FRMT_ST0) -#define DO_TEX1 (IND & R200_CP_VC_FRMT_ST1) -#define DO_PTEX (IND & R200_CP_VC_FRMT_Q0) -#define DO_NORM (IND & R200_CP_VC_FRMT_N0) - -#define DO_TEX2 0 -#define DO_TEX3 0 - -#define GET_TEXSOURCE(n) n - -/*********************************************************************** - * Generate vertex emit functions * - ***********************************************************************/ - - -/* Defined in order of increasing vertex size: - */ -#define IDX 0 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR) -#define TAG(x) x##_rgba -#include "r200_maos_vbtmp.h" - -#define IDX 1 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_N0) -#define TAG(x) x##_n -#include "r200_maos_vbtmp.h" - -#define IDX 2 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_ST0) -#define TAG(x) x##_rgba_st -#include "r200_maos_vbtmp.h" - -#define IDX 3 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_N0) -#define TAG(x) x##_rgba_n -#include "r200_maos_vbtmp.h" - -#define IDX 4 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_N0) -#define TAG(x) x##_st_n -#include "r200_maos_vbtmp.h" - -#define IDX 5 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_ST1) -#define TAG(x) x##_rgba_st_st -#include "r200_maos_vbtmp.h" - -#define IDX 6 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_N0) -#define TAG(x) x##_rgba_st_n -#include "r200_maos_vbtmp.h" - -#define IDX 7 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_PKSPEC| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_ST1) -#define TAG(x) x##_rgba_spec_st_st -#include "r200_maos_vbtmp.h" - -#define IDX 8 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_ST1| \ - R200_CP_VC_FRMT_N0) -#define TAG(x) x##_st_st_n -#include "r200_maos_vbtmp.h" - -#define IDX 9 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_PKSPEC| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_ST1| \ - R200_CP_VC_FRMT_N0) -#define TAG(x) x##_rgba_spec_st_st_n -#include "r200_maos_vbtmp.h" - -#define IDX 10 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_Q0) -#define TAG(x) x##_rgba_stq -#include "r200_maos_vbtmp.h" - -#define IDX 11 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_ST1| \ - R200_CP_VC_FRMT_Q1| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_Q0) -#define TAG(x) x##_rgba_stq_stq -#include "r200_maos_vbtmp.h" - -#define IDX 12 -#define IND (R200_CP_VC_FRMT_XY| \ - R200_CP_VC_FRMT_Z| \ - R200_CP_VC_FRMT_W0| \ - R200_CP_VC_FRMT_PKCOLOR| \ - R200_CP_VC_FRMT_PKSPEC| \ - R200_CP_VC_FRMT_ST0| \ - R200_CP_VC_FRMT_Q0| \ - R200_CP_VC_FRMT_ST1| \ - R200_CP_VC_FRMT_Q1| \ - R200_CP_VC_FRMT_N0) -#define TAG(x) x##_w_rgba_spec_stq_stq_n -#include "r200_maos_vbtmp.h" - - - - - -/*********************************************************************** - * Initialization - ***********************************************************************/ - - -static void init_tcl_verts( void ) -{ - init_rgba(); - init_n(); - init_rgba_n(); - init_rgba_st(); - init_st_n(); - init_rgba_st_st(); - init_rgba_st_n(); - init_rgba_spec_st_st(); - init_st_st_n(); - init_rgba_spec_st_st_n(); - init_rgba_stq(); - init_rgba_stq_stq(); - init_w_rgba_spec_stq_stq_n(); -} - - -void r200EmitArrays( GLcontext *ctx, GLuint inputs ) -{ - r200ContextPtr rmesa = R200_CONTEXT(ctx); - struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; - GLuint req = 0; - GLuint vtx = (rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXFMT] & - ~(R200_TCL_VTX_Q0|R200_TCL_VTX_Q1)); - int i; - static int firsttime = 1; - - if (firsttime) { - init_tcl_verts(); - firsttime = 0; - } - - if (1) { - req |= R200_CP_VC_FRMT_Z; - if (VB->ObjPtr->size == 4) { - req |= R200_CP_VC_FRMT_W0; - } - } - - if (inputs & VERT_BIT_NORMAL) { - req |= R200_CP_VC_FRMT_N0; - } - - if (inputs & VERT_BIT_COLOR0) { - req |= R200_CP_VC_FRMT_PKCOLOR; - } - - if (inputs & VERT_BIT_COLOR1) { - req |= R200_CP_VC_FRMT_PKSPEC; - } - - if (inputs & VERT_BIT_TEX0) { - req |= R200_CP_VC_FRMT_ST0; - - if (VB->TexCoordPtr[0]->size == 4) { - req |= R200_CP_VC_FRMT_Q0; - vtx |= R200_TCL_VTX_Q0; - } - } - - if (inputs & VERT_BIT_TEX1) { - req |= R200_CP_VC_FRMT_ST1; - - if (VB->TexCoordPtr[1]->size == 4) { - req |= R200_CP_VC_FRMT_Q1; - vtx |= R200_TCL_VTX_Q1; - } - } - - if (vtx != rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXFMT]) { - R200_STATECHANGE( rmesa, tcl ); - rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXFMT] = vtx; - } - - for (i = 0 ; i < R200_TCL_MAX_SETUP ; i++) - if ((setup_tab[i].vertex_format & req) == req) - break; - - if (rmesa->tcl.vertex_format == setup_tab[i].vertex_format && - rmesa->tcl.indexed_verts.buf) - return; - - if (rmesa->tcl.indexed_verts.buf) - r200ReleaseArrays( ctx, ~0 ); - - r200AllocDmaRegionVerts( rmesa, - &rmesa->tcl.indexed_verts, - VB->Count, - setup_tab[i].vertex_size * 4, - 4); - - setup_tab[i].emit( ctx, 0, VB->Count, - rmesa->tcl.indexed_verts.address + - rmesa->tcl.indexed_verts.start ); - - rmesa->tcl.vertex_format = setup_tab[i].vertex_format; - rmesa->tcl.indexed_verts.aos_start = GET_START( &rmesa->tcl.indexed_verts ); - rmesa->tcl.indexed_verts.aos_size = setup_tab[i].vertex_size; - rmesa->tcl.indexed_verts.aos_stride = setup_tab[i].vertex_size; - - rmesa->tcl.aos_components[0] = &rmesa->tcl.indexed_verts; - rmesa->tcl.nr_aos_components = 1; -} - - - -void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs ) -{ - r200ContextPtr rmesa = R200_CONTEXT( ctx ); - - if (R200_DEBUG & DEBUG_VERTS) - _tnl_print_vert_flags( __FUNCTION__, newinputs ); - - if (newinputs) - r200ReleaseDmaRegion( rmesa, &rmesa->tcl.indexed_verts, __FUNCTION__ ); -} -- cgit v1.2.3