From e84f77be215ec1fc7a27388819b6c3a711057e4a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 8 Jun 2004 09:19:17 +0000 Subject: * Convert to use t_vertex.c instead of sis_vb.[ch] * Don't dispatch vertices directly to MMIO; queue them up in dma-like buffers first. This makes things more uniform between AGP and MMIO paths, cleans up some locking ugliness, and makes the driver look more like other drivers. * Don't use the AGP Cmd buffer provided by the server. Instead allocate one in the client, which avoids the need for lots of synchronization stuff. * Mark some MMIO accesses volatile that should have been. * Disable the AGP submission path by default (agp_disable=true) due to unresolved issues in the new code. The old code had its own (serious) errors with AGP, so this is not really a step backwards. --- src/mesa/drivers/dri/sis/sis_vb.h | 62 --------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 src/mesa/drivers/dri/sis/sis_vb.h (limited to 'src/mesa/drivers/dri/sis/sis_vb.h') diff --git a/src/mesa/drivers/dri/sis/sis_vb.h b/src/mesa/drivers/dri/sis/sis_vb.h deleted file mode 100644 index 6896529887..0000000000 --- a/src/mesa/drivers/dri/sis/sis_vb.h +++ /dev/null @@ -1,62 +0,0 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_vb.h,v 1.8 2002/10/30 12:51:46 alanh Exp $ */ -/************************************************************************** - -Copyright 2003 Eric Anholt -All Rights Reserved. - -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 -on the rights to use, copy, modify, merge, publish, distribute, sub -license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL -ERIC ANHOLT 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: - * Eric Anholt - */ - -#ifndef __SIS_VB_H__ -#define __SIS_VB_H__ - -#include "mtypes.h" -#include "swrast/swrast.h" -#include "sis_context.h" - -#define _SIS_NEW_VERTEX_STATE (_DD_NEW_SEPARATE_SPECULAR | \ - _DD_NEW_TRI_LIGHT_TWOSIDE | \ - _DD_NEW_TRI_UNFILLED | \ - _NEW_TEXTURE | \ - _NEW_FOG) - -extern void sisCheckTexSizes( GLcontext *ctx ); -extern void sisChooseVertexState( GLcontext *ctx ); - -extern void sisBuildVertices( GLcontext *ctx, GLuint start, GLuint count, - GLuint newinputs ); - -extern void sisPrintSetupFlags( char *msg, GLuint flags ); - -extern void sisInitVB( GLcontext *ctx ); -extern void sisFreeVB( GLcontext *ctx ); - -extern void sis_translate_vertex( GLcontext *ctx, - const sisVertex *src, - SWvertex *dst ); - -extern void sis_print_vertex( GLcontext *ctx, const sisVertex *v ); - -#endif -- cgit v1.2.3