Added #if / #else / #endif around code related to framebuffer initialization

to describe what should be changed in the drivers.

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index f78a8cedf1b70628b8cedc817af5f2b8a531de55..f6f9e9012676f889e9e7cf4d5568403ee71147ca 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1706,6 +1706,9 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
 
         newCtx->NewState |= _NEW_BUFFERS;
 
+#if 1
+         /* We want to get rid of these lines: */
+
 #if _HAVE_FULL_GL
          if (!drawBuffer->Initialized) {
             initialize_framebuffer_size(newCtx, drawBuffer);
@@ -1716,6 +1719,23 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
 
         _mesa_resizebuffers(newCtx);
 #endif
+
+#else
+         /* We want the drawBuffer and readBuffer to be initialized by
+          * the driver.
+          * This generally means the Width and Height match the actual
+          * window size and the renderbuffers (both hardware and software
+          * based) are allocated to match.  The later can generally be
+          * done with a call to _mesa_resize_framebuffer().
+          *
+          * It's theoretically possible for a buffer to have zero width
+          * or height, but for now, assert check that the driver did what's
+          * expected of it.
+          */
+         ASSERT(drawBuffer->Width > 0);
+         ASSERT(drawBuffer->Height > 0);
+#endif
+
          if (newCtx->FirstTimeCurrent) {
             /* set initial viewport and scissor size now */
             _mesa_set_viewport(newCtx, 0, 0,