Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

1 files changed, 13 insertions, 0 deletions

diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index bca3fa5c38..d46a9178b1 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -27,8 +27,10 @@
 
 
 #include "main/imports.h"
+#include "main/buffers.h"
 #include "main/context.h"
 #include "main/framebuffer.h"
+#include "main/matrix.h"
 #include "main/renderbuffer.h"
 #include "st_public.h"
 #include "st_context.h"
@@ -124,6 +126,17 @@ void st_resize_framebuffer( struct st_framebuffer *stfb,
    if (stfb->Base.Width != width || stfb->Base.Height != height) {
       GET_CURRENT_CONTEXT(ctx);
       if (ctx) {
+         if (stfb->InitWidth == 0 && stfb->InitHeight == 0) {
+            /* didn't have a valid size until now */
+            stfb->InitWidth = width;
+            stfb->InitHeight = height;
+            if (ctx->Viewport.Width <= 1) {
+               /* set context's initial viewport/scissor size */
+               _mesa_set_viewport(ctx, 0, 0, width, height);
+               _mesa_set_scissor(ctx, 0, 0, width, height);
+            }
+         }
+
          _mesa_resize_framebuffer(ctx, &stfb->Base, width, height);
 
          assert(stfb->Base.Width == width);