From 3b3774b1227743147159676795b542c0eb7c2bdf Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 20 Mar 2008 17:08:07 -0600
Subject: gallium: catch some out of memory conditions in the texture image
 code.

st_finalize_texture()'s return code now indicates success/fail instead of
presence of texture border (which we discard earlier).
---
 src/mesa/state_tracker/st_atom_texture.c |  5 ++++-
 src/mesa/state_tracker/st_cb_texture.c   | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index 2a711e513df..9aef30f4566 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -64,7 +64,10 @@ update_textures(struct st_context *st)
          GLboolean flush, retval;
 
          retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush);
-         /* XXX retval indicates whether there's a texture border */
+         if (!retval) {
+            /* out of mem */
+            continue;
+         }
 
          st->state.num_textures = unit + 1;
       }
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 306b27c4235..a6c1a353552 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -564,7 +564,8 @@ st_TexImage(GLcontext * ctx,
    if (!stObj->pt) {
       guess_and_alloc_texture(ctx->st, stObj, stImage);
       if (!stObj->pt) {
-	 DBG("guess_and_alloc_texture: failed\n");
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
+         return;
       }
    }
 
@@ -1379,7 +1380,7 @@ copy_image_data_to_texture(struct st_context *st,
 /**
  * Called during state validation.  When this function is finished,
  * the texture object should be ready for rendering.
- * \return GL_FALSE if a texture border is present, GL_TRUE otherwise
+ * \return GL_TRUE for success, GL_FALSE for failure (out of mem)
  */
 GLboolean
 st_finalize_texture(GLcontext *ctx,
@@ -1405,6 +1406,7 @@ st_finalize_texture(GLcontext *ctx,
    calculate_first_last_level(stObj);
    firstImage = st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);
 
+#if 0
    /* Fallback case:
     */
    if (firstImage->base.Border) {
@@ -1413,7 +1415,7 @@ st_finalize_texture(GLcontext *ctx,
       }
       return GL_FALSE;
    }
-
+#endif
 
    /* If both firstImage and stObj point to a texture which can contain
     * all active images, favour firstImage.  Note that because of the
@@ -1466,6 +1468,10 @@ st_finalize_texture(GLcontext *ctx,
                                     firstImage->base.Height,
                                     firstImage->base.Depth,
                                     comp_byte);
+      if (!stObj->pt) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
+         return GL_FALSE;
+      }
    }
 
    /* Pull in any images not in the object's texture:
@@ -1486,7 +1492,6 @@ st_finalize_texture(GLcontext *ctx,
       }
    }
 
-
    return GL_TRUE;
 }
 
-- 
cgit v1.2.3