Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/state.c
	src/mesa/shader/program.c
	src/mesa/shader/program.h
	src/mesa/shader/programopt.c
	src/mesa/shader/slang/slang_execute.c
	src/mesa/sources
	src/mesa/swrast/s_arbshader.c
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_context.c
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_vb_arbprogram.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/tnl/t_vtx_eval.c

1 files changed, 0 insertions, 132 deletions

diff --git a/src/mesa/array_cache/acache.h b/src/mesa/array_cache/acache.h
deleted file mode 100644
index 2bb64f3656c..00000000000
--- a/src/mesa/array_cache/acache.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  4.1
- *
- * Copyright (C) 1999-2002  Brian Paul   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
- * 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 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
- * BRIAN PAUL 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 <[email protected]>
- */
-
-#ifndef _ARRAYCACHE_H
-#define _ARRAYCACHE_H
-
-#include "mtypes.h"
-
-
-extern GLboolean
-_ac_CreateContext( GLcontext *ctx );
-
-extern void
-_ac_DestroyContext( GLcontext *ctx );
-
-extern void
-_ac_InvalidateState( GLcontext *ctx, GLuint new_state );
-
-extern struct gl_client_array *
-_ac_import_vertex( GLcontext *ctx,
-		   GLenum type,
-		   GLuint reqstride,
-		   GLuint reqsize,
-		   GLboolean reqwritable,
-		   GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_normal( GLcontext *ctx,
-		   GLenum type,
-		   GLuint reqstride,
-		   GLboolean reqwritable,
-		   GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_color( GLcontext *ctx,
-		  GLenum type,
-		  GLuint reqstride,
-		  GLuint reqsize,
-		  GLboolean reqwritable,
-		  GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_index( GLcontext *ctx,
-		  GLenum type,
-		  GLuint reqstride,
-		  GLboolean reqwritable,
-		  GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_secondarycolor( GLcontext *ctx,
-			   GLenum type,
-			   GLuint reqstride,
-			   GLuint reqsize,
-			   GLboolean reqwritable,
-			   GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_fogcoord( GLcontext *ctx,
-		     GLenum type,
-		     GLuint reqstride,
-		     GLboolean reqwritable,
-		     GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_edgeflag( GLcontext *ctx,
-		     GLenum type,
-		     GLuint reqstride,
-		     GLboolean reqwritable,
-		     GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_texcoord( GLcontext *ctx,
-		     GLuint unit,
-		     GLenum type,
-		     GLuint reqstride,
-		     GLuint reqsize,
-		     GLboolean reqwritable,
-		     GLboolean *writable );
-
-extern struct gl_client_array *
-_ac_import_attrib( GLcontext *ctx,
-                   GLuint index,
-                   GLenum type,
-                   GLuint reqstride,
-                   GLuint reqsize,
-                   GLboolean reqwritable,
-                   GLboolean *writable );
-
-
-/* Clients must call this function to validate state and set bounds
- * before importing any data:
- */
-extern void
-_ac_import_range( GLcontext *ctx, GLuint start, GLuint count );
-
-
-/* Additional convenience function:
- */
-extern CONST void *
-_ac_import_elements( GLcontext *ctx,
-		     GLenum new_type,
-		     GLuint count,
-		     GLenum old_type,
-		     CONST void *indices );
-
-
-#endif