Mesa (master): stw: Fix minor st_api migration glitches.

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: 1dc8e08e84c6b014622e00090eb2d7301355faf6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1dc8e08e84c6b014622e00090eb2d7301355faf6

Author: José Fonseca <jfonseca at vmware.com>
Date:   Sun Apr 11 17:58:17 2010 +0900

stw: Fix minor st_api migration glitches.

---

 src/gallium/state_trackers/wgl/stw_context.c |    2 +-
 src/gallium/state_trackers/wgl/stw_st.c      |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/wgl/stw_context.c b/src/gallium/state_trackers/wgl/stw_context.c
index 663d8b8..0fb7cd8 100644
--- a/src/gallium/state_trackers/wgl/stw_context.c
+++ b/src/gallium/state_trackers/wgl/stw_context.c
@@ -320,7 +320,7 @@ stw_make_current(
    if (!stw_dev->stapi->make_current(stw_dev->stapi, ctx->st, fb->stfb, fb->stfb))
       goto fail;
 
-   stw_framebuffer_reference(&curctx->current_framebuffer, fb);
+   stw_framebuffer_reference(&ctx->current_framebuffer, fb);
 
 success:
    assert(fb);
diff --git a/src/gallium/state_trackers/wgl/stw_st.c b/src/gallium/state_trackers/wgl/stw_st.c
index 6c71f2a..1decc62 100644
--- a/src/gallium/state_trackers/wgl/stw_st.c
+++ b/src/gallium/state_trackers/wgl/stw_st.c
@@ -65,6 +65,10 @@ stw_st_framebuffer_validate_locked(struct st_framebuffer_iface *stfb,
    struct pipe_texture templ;
    unsigned i;
 
+   /* remove outdated surface */
+   pipe_surface_reference(&stwfb->front_surface, NULL);
+   pipe_surface_reference(&stwfb->back_surface, NULL);
+
    /* remove outdated textures */
    if (stwfb->texture_width != width || stwfb->texture_height != height) {
       for (i = 0; i < ST_ATTACHMENT_COUNT; i++)
@@ -137,7 +141,7 @@ stw_st_framebuffer_validate(struct st_framebuffer_iface *stfb,
 
    if (stwfb->fb->must_resize || (statt_mask & ~stwfb->texture_mask)) {
       stw_st_framebuffer_validate_locked(&stwfb->base,
-            statt_mask, stwfb->fb->width, stwfb->fb->height);
+            stwfb->fb->width, stwfb->fb->height, statt_mask);
       stwfb->fb->must_resize = FALSE;
    }