From: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon, 16 Jul 2012 14:54:30 +0000 (-0400)
Subject: intel: Don't call _mesa_get_format_bytes for MESA_FORMAT_NONE
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=636646a481ef6ce29e74e4604125a42def3ed1e5;p=mesa.git

intel: Don't call _mesa_get_format_bytes for MESA_FORMAT_NONE

When we don't intend to texture from or render to a __DRIimage we
use __DRI_IMAGE_FORMAT_NONE.  In that case, we just create the __DRIimage
to reference the underlying buffer, and will create usable __DRIimages
from it using createSubImage later.

If we try to use _mesa_get_format_bytes() on MESA_FORMAT_NONE in
a debug build, we hit an assertion, so let's not do that.
---

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 3638d0d13cb..bcd85e93dc4 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -233,7 +233,10 @@ intel_create_image_from_name(__DRIscreen *screen,
     int cpp;
 
     image = intel_allocate_image(format, loaderPrivate);
-    cpp = _mesa_get_format_bytes(image->format);
+    if (image->format == MESA_FORMAT_NONE)
+       cpp = 0;
+    else
+       cpp = _mesa_get_format_bytes(image->format);
     image->region = intel_region_alloc_for_handle(intelScreen,
 						  cpp, width, height,
 						  pitch, name, "image");