On 02/01/2012 11:29 AM, Ian Romanick wrote:
From: Ian Romanick<ian.d.roman...@intel.com>
A similar check was removed in 05ab8fc. The check is not complete
redundand because some paths, such as
_mesa_meta_check_generate_mipmap_fallback, can get to
intel_renderbuffer_update_wrapper but not get to
intel_validate_framebuffer. This occurs when trying to generate
mipmaps for GL_SLUMINANCE8 textures.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick<ian.d.roman...@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44961
Cc: Eric Anholt<e...@anholt.net>
---
src/mesa/drivers/dri/intel/intel_fbo.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c
b/src/mesa/drivers/dri/intel/intel_fbo.c
index 62ed754..c235fb4 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -482,6 +482,12 @@ intel_renderbuffer_update_wrapper(struct intel_context
*intel,
rb->Delete = intel_delete_renderbuffer;
rb->AllocStorage = intel_nop_alloc_storage;
+ if (!intel->vtbl.render_target_supported(intel, rb)) {
+ DBG("Render to texture BAD FORMAT %s\n",
+ _mesa_get_format_name(rb->Format));
+ return false;
+ }
+
intel_miptree_check_level_layer(mt, level, layer);
irb->mt_level = level;
irb->mt_layer = layer;
Looks reasonable to me, though I obviously defer to Eric's judgement as
I'm not terribly familiar with this code.
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
