diff options
| author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2013-11-12 14:47:08 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-11-12 15:57:39 -0800 |
| commit | 5ba6be2617a46a7cd8567ffe65f496e917a93374 (patch) | |
| tree | 03f8ec7c406c14fa1cf24ac39a7f26cf5d9c33a1 /src/mesa/drivers | |
| parent | e9daead784921e453906853a4a78a2f3135af2e0 (diff) | |
| download | external_mesa3d-5ba6be2617a46a7cd8567ffe65f496e917a93374.zip external_mesa3d-5ba6be2617a46a7cd8567ffe65f496e917a93374.tar.gz external_mesa3d-5ba6be2617a46a7cd8567ffe65f496e917a93374.tar.bz2 | |
dri/i915, dri/i965: Fix support for planar images
Planar images have format __DRI_IMAGE_FORMAT_NONE, but the patch that
moved the conversion from dri_format to the mesa format made it
impossible to allocate a image with that format.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Cc: "10.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 2c309ed..a10331c 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -246,7 +246,8 @@ intel_allocate_image(int dri_format, void *loaderPrivate) image->offset = 0; image->format = driImageFormatToGLFormat(dri_format); - if (image->format == 0) { + if (dri_format != __DRI_IMAGE_FORMAT_NONE && + image->format == MESA_FORMAT_NONE) { free(image); return NULL; } diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index e39d654..6bcfe2c 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -300,7 +300,8 @@ intel_allocate_image(int dri_format, void *loaderPrivate) image->offset = 0; image->format = driImageFormatToGLFormat(dri_format); - if (image->format == 0) { + if (dri_format != __DRI_IMAGE_FORMAT_NONE && + image->format == MESA_FORMAT_NONE) { free(image); return NULL; } |