Mesa (master): intel: allow packed prime buffers to be treated normally

[Topi Pohjolainen]

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

Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date:   Thu Apr 25 14:33:09 2013 +0300

intel: allow packed prime buffers to be treated normally

v2:
   - fix earlier rebase error breaking bisect
     (loaderPriv -> loaderPrivate)

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/dri/i965/intel_screen.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index f913c42..ce7a51e 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -651,7 +651,11 @@ intel_create_image_from_fds(__DRIscreen *screen,
    if (f == NULL)
       return NULL;
 
-   image = intel_allocate_image(__DRI_IMAGE_FORMAT_NONE, loaderPrivate);
+   if (f->nplanes == 1)
+      image = intel_allocate_image(f->planes[0].dri_format, loaderPrivate);
+   else
+      image = intel_allocate_image(__DRI_IMAGE_FORMAT_NONE, loaderPrivate);
+
    if (image == NULL)
       return NULL;