Lots of changes related to framebuffer/window buffer resizing. Basically,

instead of passing a GLcontext* to ResizeBuffers(), pass a GLframebuffer*.
The idea is that a window can be resized without it being bound to a rendering
context.  This makes for a nice clean-up in the XFree86 server-side GLX code.
Renamed ctx->Driver.ResizeBuffersMESA() to ctx->Driver.ResizeBuffers().

1 files changed, 44 insertions, 59 deletions

diff --git a/src/mesa/swrast/s_alphabuf.c b/src/mesa/swrast/s_alphabuf.c
index 2a066aeee70..2b7c4f7de26 100644
--- a/src/mesa/swrast/s_alphabuf.c
+++ b/src/mesa/swrast/s_alphabuf.c
@@ -1,10 +1,10 @@
-/* $Id: s_alphabuf.c,v 1.8 2001/07/13 20:07:37 brianp Exp $ */
+/* $Id: s_alphabuf.c,v 1.9 2002/03/16 00:53:15 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.0.2
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * 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"),
@@ -38,8 +38,6 @@
 #include "s_alphabuf.h"
 
 
-
-
 #define ALPHA_DRAW_ADDR(X,Y) \
    (ctx->DrawBuffer->Alpha + (Y) * ctx->DrawBuffer->Width + (X))
 
@@ -47,85 +45,72 @@
    (ctx->ReadBuffer->Alpha + (Y) * ctx->ReadBuffer->Width + (X))
 
 
-
 /*
- * Allocate new front/back/left/right alpha buffers.
- * Input: ctx - the context
- *
+ * Allocate a new front and back alpha buffer.
  */
-static void
-alloc_alpha_buffers( GLcontext *ctx, GLframebuffer *buf )
+void
+_mesa_alloc_alpha_buffers( GLframebuffer *buffer )
 {
-   GLint bytes = buf->Width * buf->Height * sizeof(GLchan);
+   GET_CURRENT_CONTEXT(ctx);
+   const GLint bytes = buffer->Width * buffer->Height * sizeof(GLchan);
 
-   ASSERT(ctx->DrawBuffer->UseSoftwareAlphaBuffers);
+   ASSERT(buffer->UseSoftwareAlphaBuffers);
 
-   if (buf->FrontLeftAlpha) {
-      FREE( buf->FrontLeftAlpha );
+   if (buffer->FrontLeftAlpha) {
+      FREE( buffer->FrontLeftAlpha );
    }
-   buf->FrontLeftAlpha = (GLchan *) MALLOC( bytes );
-   if (!buf->FrontLeftAlpha) {
+   buffer->FrontLeftAlpha = (GLchan *) MALLOC( bytes );
+   if (!buffer->FrontLeftAlpha) {
       /* out of memory */
-      _mesa_error( ctx, GL_OUT_OF_MEMORY,
-                "Couldn't allocate front-left alpha buffer" );
+      _mesa_error( NULL, GL_OUT_OF_MEMORY,
+                   "Couldn't allocate front-left alpha buffer" );
    }
 
-   if (ctx->Visual.doubleBufferMode) {
-      if (buf->BackLeftAlpha) {
-         FREE( buf->BackLeftAlpha );
+   if (buffer->Visual.doubleBufferMode) {
+      if (buffer->BackLeftAlpha) {
+         FREE( buffer->BackLeftAlpha );
       }
-      buf->BackLeftAlpha = (GLchan *) MALLOC( bytes );
-      if (!buf->BackLeftAlpha) {
+      buffer->BackLeftAlpha = (GLchan *) MALLOC( bytes );
+      if (!buffer->BackLeftAlpha) {
          /* out of memory */
-         _mesa_error( ctx, GL_OUT_OF_MEMORY,
+         _mesa_error( NULL, GL_OUT_OF_MEMORY,
                       "Couldn't allocate back-left alpha buffer" );
       }
    }
 
-   if (ctx->Visual.stereoMode) {
-      if (buf->FrontRightAlpha) {
-         FREE( buf->FrontRightAlpha );
+   if (buffer->Visual.stereoMode) {
+      if (buffer->FrontRightAlpha) {
+         FREE( buffer->FrontRightAlpha );
       }
-      buf->FrontRightAlpha = (GLchan *) MALLOC( bytes );
-      if (!buf->FrontRightAlpha) {
+      buffer->FrontRightAlpha = (GLchan *) MALLOC( bytes );
+      if (!buffer->FrontRightAlpha) {
          /* out of memory */
-         _mesa_error( ctx, GL_OUT_OF_MEMORY,
-                   "Couldn't allocate front-right alpha buffer" );
+         _mesa_error( NULL, GL_OUT_OF_MEMORY,
+                      "Couldn't allocate front-right alpha buffer" );
       }
 
-      if (ctx->Visual.doubleBufferMode) {
-         if (buf->BackRightAlpha) {
-            FREE( buf->BackRightAlpha );
+      if (buffer->Visual.doubleBufferMode) {
+         if (buffer->BackRightAlpha) {
+            FREE( buffer->BackRightAlpha );
          }
-         buf->BackRightAlpha = (GLchan *) MALLOC( bytes );
-         if (!buf->BackRightAlpha) {
+         buffer->BackRightAlpha = (GLchan *) MALLOC( bytes );
+         if (!buffer->BackRightAlpha) {
             /* out of memory */
-            _mesa_error( ctx, GL_OUT_OF_MEMORY,
-                      "Couldn't allocate back-right alpha buffer" );
+            _mesa_error( NULL, GL_OUT_OF_MEMORY,
+                         "Couldn't allocate back-right alpha buffer" );
          }
       }
    }
 
-   if (ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT)
-      buf->Alpha = buf->FrontLeftAlpha;
-   else if (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT)
-      buf->Alpha = buf->BackLeftAlpha;
-   else if (ctx->Color.DriverDrawBuffer == GL_FRONT_RIGHT)
-      buf->Alpha = buf->FrontRightAlpha;
-   else if (ctx->Color.DriverDrawBuffer == GL_BACK_RIGHT)
-      buf->Alpha = buf->BackRightAlpha;
-}
-
-
-/*
- * Allocate a new front and back alpha buffer.
- */
-void
-_mesa_alloc_alpha_buffers( GLcontext *ctx )
-{
-   alloc_alpha_buffers( ctx, ctx->DrawBuffer );
-   if (ctx->ReadBuffer != ctx->DrawBuffer) {
-      alloc_alpha_buffers( ctx, ctx->ReadBuffer );
+   if (ctx) {
+      if (ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT)
+         buffer->Alpha = buffer->FrontLeftAlpha;
+      else if (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT)
+         buffer->Alpha = buffer->BackLeftAlpha;
+      else if (ctx->Color.DriverDrawBuffer == GL_FRONT_RIGHT)
+         buffer->Alpha = buffer->FrontRightAlpha;
+      else if (ctx->Color.DriverDrawBuffer == GL_BACK_RIGHT)
+         buffer->Alpha = buffer->BackRightAlpha;
    }
 }