From a1e97828c89278770cb249039ec92d959440c640 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 9 Jan 2012 16:34:28 +0100
Subject: xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan
 2011

---
 mesalib/src/mesa/swrast/s_context.c | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

(limited to 'mesalib/src/mesa/swrast/s_context.c')

diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c
index 6850a09f3..94b7fe34d 100644
--- a/mesalib/src/mesa/swrast/s_context.c
+++ b/mesalib/src/mesa/swrast/s_context.c
@@ -36,7 +36,6 @@
 #include "swrast.h"
 #include "s_blend.h"
 #include "s_context.h"
-#include "s_depthstencil.h"
 #include "s_lines.h"
 #include "s_points.h"
 #include "s_span.h"
@@ -493,7 +492,7 @@ static void
 _swrast_update_active_attribs(struct gl_context *ctx)
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint attribsMask;
+   GLbitfield64 attribsMask;
 
    /*
     * Compute _ActiveAttribsMask = which fragment attributes are needed.
@@ -546,25 +545,6 @@ _swrast_update_active_attribs(struct gl_context *ctx)
 }
 
 
-/**
- * Update the depth/stencil renderbuffers, if needed.
- */
-static void
-_swrast_update_depth_stencil(struct gl_context *ctx)
-{
-   struct gl_framebuffer *drawFb = ctx->DrawBuffer;
-   struct gl_framebuffer *readFb = ctx->ReadBuffer;
-
-   _swrast_update_depth_buffer(ctx, drawFb);
-   _swrast_update_stencil_buffer(ctx, drawFb);
-
-   if (readFb != drawFb) {
-      _swrast_update_depth_buffer(ctx, readFb);
-      _swrast_update_stencil_buffer(ctx, readFb);
-   }
-}
-
-
 void
 _swrast_validate_derived( struct gl_context *ctx )
 {
@@ -609,9 +589,6 @@ _swrast_validate_derived( struct gl_context *ctx )
                               _NEW_TEXTURE))
          _swrast_update_specular_vertex_add(ctx);
 
-      if (swrast->NewState & _NEW_BUFFERS)
-         _swrast_update_depth_stencil(ctx);
-
       swrast->NewState = 0;
       swrast->StateChanges = 0;
       swrast->InvalidateState = _swrast_invalidate_state;
@@ -741,9 +718,9 @@ _swrast_CreateContext( struct gl_context *ctx )
    GLuint i;
    SWcontext *swrast = (SWcontext *)CALLOC(sizeof(SWcontext));
 #ifdef _OPENMP
-   const GLint maxThreads = omp_get_max_threads();
+   const GLuint maxThreads = omp_get_max_threads();
 #else
-   const GLint maxThreads = 1;
+   const GLuint maxThreads = 1;
 #endif
 
    if (SWRAST_DEBUG) {
-- 
cgit v1.2.3