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

egl: polish EXT_image_dma_buf_import attr parsing

Browse Source 
Simplify the existing if/else + temporary variable into if (foo) return
X.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Emil Velikov
2017-06-29 00:09:15 +01:00
committed by Emil Velikov
parent 448f70e366
commit d13dcca2c2
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/egl/main/eglimage.c
View File

@@ -106,8 +106,6 @@ static EGLint
_eglParseEXTImageDmaBufImportAttribs(_EGLImageAttribs *attrs, _EGLDisplay *dpy, _eglParseEXTImageDmaBufImportAttribs(_EGLImageAttribs *attrs, _EGLDisplay *dpy,
EGLint attr, EGLint val) EGLint attr, EGLint val)
{ {
EGLint err = EGL_SUCCESS;
switch (attr) { switch (attr) {
case EGL_LINUX_DRM_FOURCC_EXT: case EGL_LINUX_DRM_FOURCC_EXT:
attrs->DMABufFourCC.Value = val; attrs->DMABufFourCC.Value = val;
@@ -151,45 +149,40 @@ _eglParseEXTImageDmaBufImportAttribs(_EGLImageAttribs *attrs, _EGLDisplay *dpy,
break; break;
case EGL_YUV_COLOR_SPACE_HINT_EXT: case EGL_YUV_COLOR_SPACE_HINT_EXT:
if (val != EGL_ITU_REC601_EXT && val != EGL_ITU_REC709_EXT && if (val != EGL_ITU_REC601_EXT && val != EGL_ITU_REC709_EXT &&
val != EGL_ITU_REC2020_EXT) { val != EGL_ITU_REC2020_EXT)
err = EGL_BAD_ATTRIBUTE; return EGL_BAD_ATTRIBUTE;
} else {
attrs->DMABufYuvColorSpaceHint.Value = val; attrs->DMABufYuvColorSpaceHint.Value = val;
attrs->DMABufYuvColorSpaceHint.IsPresent = EGL_TRUE; attrs->DMABufYuvColorSpaceHint.IsPresent = EGL_TRUE;
}
break; break;
case EGL_SAMPLE_RANGE_HINT_EXT: case EGL_SAMPLE_RANGE_HINT_EXT:
if (val != EGL_YUV_FULL_RANGE_EXT && val != EGL_YUV_NARROW_RANGE_EXT) { if (val != EGL_YUV_FULL_RANGE_EXT && val != EGL_YUV_NARROW_RANGE_EXT)
err = EGL_BAD_ATTRIBUTE; return EGL_BAD_ATTRIBUTE;
} else {
attrs->DMABufSampleRangeHint.Value = val; attrs->DMABufSampleRangeHint.Value = val;
attrs->DMABufSampleRangeHint.IsPresent = EGL_TRUE; attrs->DMABufSampleRangeHint.IsPresent = EGL_TRUE;
}
break; break;
case EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT: case EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT:
if (val != EGL_YUV_CHROMA_SITING_0_EXT && if (val != EGL_YUV_CHROMA_SITING_0_EXT &&
val != EGL_YUV_CHROMA_SITING_0_5_EXT) { val != EGL_YUV_CHROMA_SITING_0_5_EXT)
err = EGL_BAD_ATTRIBUTE; return EGL_BAD_ATTRIBUTE;
} else {
attrs->DMABufChromaHorizontalSiting.Value = val; attrs->DMABufChromaHorizontalSiting.Value = val;
attrs->DMABufChromaHorizontalSiting.IsPresent = EGL_TRUE; attrs->DMABufChromaHorizontalSiting.IsPresent = EGL_TRUE;
}
break; break;
case EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT: case EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT:
if (val != EGL_YUV_CHROMA_SITING_0_EXT && if (val != EGL_YUV_CHROMA_SITING_0_EXT &&
val != EGL_YUV_CHROMA_SITING_0_5_EXT) { val != EGL_YUV_CHROMA_SITING_0_5_EXT)
err = EGL_BAD_ATTRIBUTE; return EGL_BAD_ATTRIBUTE;
} else {
attrs->DMABufChromaVerticalSiting.Value = val; attrs->DMABufChromaVerticalSiting.Value = val;
attrs->DMABufChromaVerticalSiting.IsPresent = EGL_TRUE; attrs->DMABufChromaVerticalSiting.IsPresent = EGL_TRUE;
}
break; break;
default: default:
err = EGL_BAD_PARAMETER; return EGL_BAD_PARAMETER;
break;
} }
return err; return EGL_SUCCESS;
} }
static EGLint static EGLint