Mesa (9.1): intel: Fix regression in intel_create_image_from_name stride handling

Ian Romanick idr at kemper.freedesktop.org
Mon Mar 25 21:07:46 UTC 2013


Module: Mesa
Branch: 9.1
Commit: a31c9c3fa9e969c52754269240131ea66b7db50e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a31c9c3fa9e969c52754269240131ea66b7db50e

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Mon Jan 28 08:53:56 2013 +0200

intel: Fix regression in intel_create_image_from_name stride handling

Strangely, the DRIimage interface we have passes the pitch in pixels
instead of bytes, which anholt missed in the change to using bytes for
region pitch.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61197
(cherry picked from commit e062a4187d8ea518a39c913ae7562cf1d8ac3205)

---

 src/mesa/drivers/dri/intel/intel_screen.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 5ec93f1..4173c0f 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -312,7 +312,7 @@ intel_create_image_from_name(__DRIscreen *screen,
        cpp = _mesa_get_format_bytes(image->format);
     image->region = intel_region_alloc_for_handle(intelScreen,
 						  cpp, width, height,
-						  pitch, name, "image");
+						  pitch * cpp, name, "image");
     if (image->region == NULL) {
        free(image);
        return NULL;




More information about the mesa-commit mailing list