From: Keith Whitwell <keithw@vmware.com>
Date: Mon, 27 Apr 2009 17:56:26 +0000 (+0100)
Subject: mesa/st: workaround for crashes in st_copy_texsubimage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=afd16512bc354cf1a7220cb9bf3ce445503c7af4;p=mesa.git

mesa/st: workaround for crashes in st_copy_texsubimage

Proper fix for this hasn't been identified, but avoid crashing.
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index aeb75117ec3..b7b791d9a41 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -51,6 +51,7 @@
 #include "state_tracker/st_texture.h"
 #include "state_tracker/st_gen_mipmap.h"
 #include "state_tracker/st_inlines.h"
+#include "state_tracker/st_atom.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
@@ -1317,6 +1318,10 @@ st_copy_texsubimage(GLcontext *ctx,
    /* any rendering in progress must complete before we grab the fb image */
    st_finish(ctx->st);
 
+   /* make sure finalize_textures has been called? 
+    */
+   if (0) st_validate_state(ctx->st);
+
    /* determine if copying depth or color data */
    if (texBaseFormat == GL_DEPTH_COMPONENT ||
        texBaseFormat == GL_DEPTH24_STENCIL8) {
@@ -1330,6 +1335,11 @@ st_copy_texsubimage(GLcontext *ctx,
       strb = st_renderbuffer(fb->_ColorReadBuffer);
    }
 
+   if (!strb || !strb->surface || !stImage->pt) {
+      debug_printf("%s: null strb or stImage\n", __FUNCTION__);
+      return;
+   }
+
    assert(strb);
    assert(strb->surface);
    assert(stImage->pt);