OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/dri: Add error info needed for EGL_EXT_image_dma_buf_import extension

Browse Source 
Update the DRI image interface error codes to reflect the needs of the
EGL_EXT_image_dma_buf_import extension. This means updating the existing error
code documentation and adding a new __DRI_IMAGE_ERROR_BAD_ACCESS error code
so that drivers can correctly reject unsupported pitches and offsets. Hook
the new error code up in EGL to return EGL_BAD_ACCESS.

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Frank Binns
2015-07-31 09:11:46 +01:00
committed by Eric Anholt
parent ee47d13abb
commit cfc3200a35
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/GL/internal/dri_interface.h
View File

@@ -1178,7 +1178,8 @@ enum __DRIChromaSiting {
}; };
/** /**
* \name Reasons that __DRIimageExtensionRec::createImageFromTexture might fail * \name Reasons that __DRIimageExtensionRec::createImageFromTexture or
* __DRIimageExtensionRec::createImageFromDmaBufs might fail
*/ */
/*@{*/ /*@{*/
/** Success! */ /** Success! */
@@ -1187,11 +1188,14 @@ enum __DRIChromaSiting {
/** Memory allocation failure */ /** Memory allocation failure */
#define __DRI_IMAGE_ERROR_BAD_ALLOC 1 #define __DRI_IMAGE_ERROR_BAD_ALLOC 1
/** Client requested an invalid attribute for a texture object */ /** Client requested an invalid attribute */
#define __DRI_IMAGE_ERROR_BAD_MATCH 2 #define __DRI_IMAGE_ERROR_BAD_MATCH 2
/** Client requested an invalid texture object */ /** Client requested an invalid texture object */
#define __DRI_IMAGE_ERROR_BAD_PARAMETER 3 #define __DRI_IMAGE_ERROR_BAD_PARAMETER 3
/** Client requested an invalid pitch and/or offset */
#define __DRI_IMAGE_ERROR_BAD_ACCESS 4
/*@}*/ /*@}*/
/** /**

4
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -1545,6 +1545,10 @@ dri2_create_image_khr_texture_error(int dri_error)
egl_error = EGL_BAD_PARAMETER; egl_error = EGL_BAD_PARAMETER;
break; break;
case __DRI_IMAGE_ERROR_BAD_ACCESS:
egl_error = EGL_BAD_ACCESS;
break;
default: default:
assert(0); assert(0);
egl_error = EGL_BAD_MATCH; egl_error = EGL_BAD_MATCH;