From: Plamena Manolova <plamena.manolova@intel.com>
Date: Wed, 1 Jun 2016 16:31:29 +0000 (+0100)
Subject: egl: Account for default values of texture target and format
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b67efaed2038c68e08eb8b550d7b78494b54254;p=mesa.git

egl: Account for default values of texture target and format

When validating attributes during surface creation we should account
for the default values of texture target and format (EGL_NO_TEXTURE)
since the user is not obligated to explicitly set both via the
attribute list passed to eglCreatePbufferSurface.

Signed-off-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
---

diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c
index 17d79077837..99e24dd8895 100644
--- a/src/egl/main/eglsurface.c
+++ b/src/egl/main/eglsurface.c
@@ -236,6 +236,12 @@ _eglParseSurfaceAttribList(_EGLSurface *surf, const EGLint *attrib_list)
       }
 
       if (type == EGL_PBUFFER_BIT) {
+         if (tex_target == -1)
+            tex_target = surf->TextureTarget;
+
+         if (tex_format == -1)
+            tex_format = surf->TextureFormat;
+
          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;