Mesa (master): mesa: replace assertion with no-op function assignment
Brian Paul
brianp at kemper.freedesktop.org
Thu Sep 24 22:07:07 UTC 2009
Module: Mesa
Branch: master
Commit: f0339f502cf96499bc5cac8c0611f76f3fd39461
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0339f502cf96499bc5cac8c0611f76f3fd39461
Author: Brian Paul <brianp at vmware.com>
Date: Thu Sep 24 12:37:34 2009 -0600
mesa: replace assertion with no-op function assignment
---
src/mesa/main/texrender.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index cc74d58..53be83b 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -398,6 +398,14 @@ texture_put_mono_values(GLcontext *ctx, struct gl_renderbuffer *rb,
static void
+store_nop(struct gl_texture_image *texImage,
+ GLint col, GLint row, GLint img,
+ const void *texel)
+{
+}
+
+
+static void
delete_texture_wrapper(struct gl_renderbuffer *rb)
{
ASSERT(rb->RefCount == 0);
@@ -462,7 +470,10 @@ update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
ASSERT(trb->TexImage);
trb->Store = trb->TexImage->TexFormat->StoreTexel;
- ASSERT(trb->Store);
+ if (!trb->Store) {
+ /* we'll never draw into some textures (compressed formats) */
+ trb->Store = store_nop;
+ }
if (att->Texture->Target == GL_TEXTURE_1D_ARRAY_EXT) {
trb->Yoffset = att->Zoffset;
More information about the mesa-commit
mailing list