From ed43ecee90ad6fdde1e604f7f820ef7f8cd1251b Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Mon, 19 Jan 2004 10:41:35 +0000 Subject: Migrate i830 driver to t_vertex.[ch] for building hw vertices. --- src/mesa/drivers/dri/i830/i830_state.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/mesa/drivers/dri/i830/i830_state.c') diff --git a/src/mesa/drivers/dri/i830/i830_state.c b/src/mesa/drivers/dri/i830/i830_state.c index 004b49acec..11f0fd7948 100644 --- a/src/mesa/drivers/dri/i830/i830_state.c +++ b/src/mesa/drivers/dri/i830/i830_state.c @@ -49,7 +49,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i830_context.h" #include "i830_state.h" #include "i830_tex.h" -#include "i830_vb.h" #include "i830_tris.h" #include "i830_ioctl.h" @@ -1549,17 +1548,8 @@ void i830DDInitState( GLcontext *ctx ) memset(imesa->Setup, 0, sizeof(imesa->Setup)); - imesa->Setup[I830_CTXREG_VF] = (STATE3D_VERTEX_FORMAT_CMD | - VRTX_TEX_COORD_COUNT(1) | - VRTX_HAS_DIFFUSE | - VRTX_HAS_SPEC | - VRTX_HAS_XYZW); - imesa->vertex_format = 0; - imesa->Setup[I830_CTXREG_VF2] = (STATE3D_VERTEX_FORMAT_2_CMD | - VRTX_TEX_SET_0_FMT(TEXCOORDFMT_2D) | - VRTX_TEX_SET_1_FMT(TEXCOORDFMT_2D) | - VRTX_TEX_SET_2_FMT(TEXCOORDFMT_2D) | - VRTX_TEX_SET_3_FMT(TEXCOORDFMT_2D)); + imesa->Setup[I830_CTXREG_VF] = 0; + imesa->Setup[I830_CTXREG_VF2] = 0; imesa->Setup[I830_CTXREG_AA] = (STATE3D_AA_CMD | AA_LINE_ECAAR_WIDTH_ENABLE | -- cgit v1.2.3