Merge remote branch 'origin/master' into lp-binning

Conflicts:
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/Makefile
	src/gallium/drivers/llvmpipe/SConscript
	src/gallium/drivers/llvmpipe/lp_bld_arit.c
	src/gallium/drivers/llvmpipe/lp_bld_flow.c
	src/gallium/drivers/llvmpipe/lp_bld_interp.c
	src/gallium/drivers/llvmpipe/lp_clear.c
	src/gallium/drivers/llvmpipe/lp_context.c
	src/gallium/drivers/llvmpipe/lp_context.h
	src/gallium/drivers/llvmpipe/lp_draw_arrays.c
	src/gallium/drivers/llvmpipe/lp_jit.c
	src/gallium/drivers/llvmpipe/lp_jit.h
	src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_state.h
	src/gallium/drivers/llvmpipe/lp_state_blend.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_sampler.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.h
	src/gallium/drivers/llvmpipe/lp_tex_sample.h
	src/gallium/drivers/llvmpipe/lp_tile_cache.c

1 files changed, 0 insertions, 79 deletions

diff --git a/src/mesa/drivers/dri/s3v/s3v_inithw.c b/src/mesa/drivers/dri/s3v/s3v_inithw.c
deleted file mode 100644
index bdc9effb79..0000000000
--- a/src/mesa/drivers/dri/s3v/s3v_inithw.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Author: Max Lingua <sunmax@libero.it>
- */
-
-#include <sys/ioctl.h>
-
-#include "s3v_context.h"
-
-void s3vInitHW( s3vContextPtr vmesa )
-{
-	int i;
-	static short _reset = 1;
-
-	DEBUG(("vmesa->driDrawable = %p\n", vmesa->driDrawable));
-	DEBUG(("stride = %i\n",
-		vmesa->driScreen->fbWidth*vmesa->s3vScreen->cpp));
-	DEBUG(("frontOffset = 0x%x\n", vmesa->s3vScreen->frontOffset));
-	DEBUG(("backOffset = 0x%x\n", vmesa->s3vScreen->backOffset));
-	DEBUG(("depthOffset = 0x%x\n", vmesa->s3vScreen->depthOffset));
-	DEBUG(("textureOffset = 0x%x\n", vmesa->s3vScreen->texOffset));
-
-/*	if (_reset) { */
-/*	ioctl(vmesa->driFd, 0x4a); */
-		ioctl(vmesa->driFd, 0x41); /* reset */
-		_reset = 0;
-/*	ioctl(vmesa->driFd, 0x4c); */
-/*	} */
-
-	/* FIXME */
-	switch (vmesa->s3vScreen->cpp) {
-		case 2:
-			break;
-		case 4:
-			break;
-	}
-
-	/* FIXME for stencil, gid, etc */
-	switch (vmesa->DepthSize) {
-		case 15:
-		case 16:
-			break;
-		case 24:
-			break;
-		case 32:
-			break;
-	}
-
-	vmesa->FogMode = 1;
-	vmesa->ClearDepth = 0xffff;
-	vmesa->x = 0;
-	vmesa->y = 0;
-	vmesa->w = 0;
-	vmesa->h = 0;
-	vmesa->FrameCount = 0;
-	vmesa->MatrixMode = GL_MODELVIEW;
-	vmesa->ModelViewCount = 0;
-	vmesa->ProjCount = 0;
-	vmesa->TextureCount = 0;
-
-
-	/* FIXME: do we need the following? */
-
-	for (i = 0; i < 16; i++)
-		if (i % 5 == 0)
-			vmesa->ModelView[i] =
-			vmesa->Proj[i] =
-			vmesa->ModelViewProj[i] =
-			vmesa->Texture[i] = 1.0;
-		else
-			vmesa->ModelView[i] =
-			vmesa->Proj[i] =
-			vmesa->ModelViewProj[i] =
-			vmesa->Texture[i] = 0.0;
-
-	vmesa->LBWindowBase = vmesa->driScreen->fbWidth *
-				(vmesa->driScreen->fbHeight - 1);
-	vmesa->FBWindowBase = vmesa->driScreen->fbWidth * 
-				(vmesa->driScreen->fbHeight - 1);
-}