fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 09:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: Additional attribute validation for eglCreatePbufferSurface

Browse source 
eglCreatePbufferSurface should generate an EGL_BAD_MATCH error if:
1: The EGL_TEXTURE_FORMAT attribute is EGL_NO_TEXTURE and EGL_TEXTURE_TARGET
is something other than EGL_NO_TEXTURE
2: EGL_TEXTURE_FORMAT is something other than EGL_NO_TEXTURE and
EGL_TEXTURE_TARGET is EGL_NO_TEXTURE.

This fixes the dEQP-EGL.functional.negative_api.create_pbuffer_surface test.

Signed-off-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Plamena Manolova 2016-05-25 17:29:55 +01:00 • committed by Ben Widawsky
parent 8539c9bf31
commit a0674ce5c4
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/egl/main/eglsurface.c
View file

@ -71,6 +71,8 @@ _eglParseSurfaceAttribList(_EGLSurface *surf, const EGLint *attrib_list)
EGLint type = surf->Type;
EGLint texture_type = EGL_PBUFFER_BIT;
EGLint i, err = EGL_SUCCESS;
EGLint tex_target = -1;
EGLint tex_format = -1;
if (!attrib_list)
return EGL_SUCCESS;
@ -186,6 +188,8 @@ _eglParseSurfaceAttribList(_EGLSurface *surf, const EGLint *attrib_list)
err = EGL_BAD_ATTRIBUTE;
break;
}
tex_format = val;
switch (val) {
case EGL_TEXTURE_RGB:
case EGL_TEXTURE_RGBA:
@ -204,6 +208,8 @@ _eglParseSurfaceAttribList(_EGLSurface *surf, const EGLint *attrib_list)
err = EGL_BAD_ATTRIBUTE;
break;
}
tex_target = val;
switch (val) {
case EGL_TEXTURE_2D:
case EGL_NO_TEXTURE:
@ -229,6 +235,13 @@ _eglParseSurfaceAttribList(_EGLSurface *surf, const EGLint *attrib_list)
break;
}
if (type == EGL_PBUFFER_BIT) {
if ((tex_target == EGL_NO_TEXTURE && tex_format != EGL_NO_TEXTURE) ||
(tex_format == EGL_NO_TEXTURE && tex_target != EGL_NO_TEXTURE)) {
err = EGL_BAD_MATCH;
}
}
if (err != EGL_SUCCESS) {
_eglLog(_EGL_WARNING, "bad surface attribute 0x%04x", attr);
break;