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, 4 insertions, 16 deletions

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index eb5a0318dea..9b043488068 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -292,13 +292,8 @@ _mesa_forceCurrent(__GLcontext *gc)
 GLboolean
 _mesa_notifyResize(__GLcontext *gc)
 {
-   GLint x, y;
-   GLuint width, height;
-   __GLdrawablePrivate *d = gc->imports.getDrawablePrivate(gc);
-   if (!d || !d->getDrawableSize)
-      return GL_FALSE;
-   d->getDrawableSize( d, &x, &y, &width, &height );
    /* update viewport, resize software buffers, etc. */
+   (void) gc;
    return GL_TRUE;
 }
 
@@ -990,9 +985,8 @@ _mesa_init_current(GLcontext *ctx)
    ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_NORMAL], 0.0, 0.0, 1.0, 1.0 );
    ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR0], 1.0, 1.0, 1.0, 1.0 );
    ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR1], 0.0, 0.0, 0.0, 1.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_FOG], 0.0, 0.0, 0.0, 0.0 );
-   ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0] = 1.0;
-   ctx->Current.EdgeFlag = GL_TRUE;
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX], 1.0, 0.0, 0.0, 1.0 );
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG], 1.0, 0.0, 0.0, 1.0 );
 }
 
 
@@ -1093,14 +1087,8 @@ _mesa_init_constants(GLcontext *ctx)
    ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;
    ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
 
-   /* If we're running in the X server, do bounds checking to prevent
-    * segfaults and server crashes!
-    */
-#if defined(XFree86Server)
-   ctx->Const.CheckArrayBounds = GL_TRUE;
-#else
+   /* CheckArrayBounds is overriden by drivers/x11 for X server */
    ctx->Const.CheckArrayBounds = GL_FALSE;
-#endif
 
    /* GL_ARB_draw_buffers */
    ctx->Const.MaxDrawBuffers = MAX_DRAW_BUFFERS;