egl: Move attributes in _EGLImage to _EGLImageAttribs.

The opaque nature of EGLImage implies that extensions almost always
define their own attributes.  Move attributes in _EGLImage to
_EGLImageAttribs and add a helper function to parse attribute lists.

5 files changed, 42 insertions, 28 deletions

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index aad1c254b76..f2b532d92c8 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1599,7 +1599,7 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
       return EGL_NO_IMAGE_KHR;
    }
 
-   if (!_eglInitImage(&dri2_img->base, disp, attr_list)) {
+   if (!_eglInitImage(&dri2_img->base, disp)) {
       free(buffers_reply);
       free(geometry_reply);
       return EGL_NO_IMAGE_KHR;
@@ -1642,7 +1642,7 @@ dri2_create_image_khr_renderbuffer(_EGLDisplay *disp, _EGLContext *ctx,
       return EGL_NO_IMAGE_KHR;
    }
 
-   if (!_eglInitImage(&dri2_img->base, disp, attr_list))
+   if (!_eglInitImage(&dri2_img->base, disp))
       return EGL_NO_IMAGE_KHR;
 
    dri2_img->dri_image = 
@@ -1722,7 +1722,7 @@ dri2_create_image_mesa_drm_buffer(_EGLDisplay *disp, _EGLContext *ctx,
       return NULL;
    }
 
-   if (!_eglInitImage(&dri2_img->base, disp, attr_list)) {
+   if (!_eglInitImage(&dri2_img->base, disp)) {
       free(dri2_img);
       return NULL;
    }
@@ -1801,7 +1801,7 @@ dri2_create_drm_image_mesa(_EGLDriver *drv, _EGLDisplay *disp,
       goto cleanup_img;
    }
 
-   if (!_eglInitImage(&dri2_img->base, disp, attr_list)) {
+   if (!_eglInitImage(&dri2_img->base, disp)) {
       err = EGL_BAD_PARAMETER;
       goto cleanup_img;
    }
diff --git a/src/egl/main/eglimage.c b/src/egl/main/eglimage.c
index 5732ef35ecd..e11a1836ff6 100644
--- a/src/egl/main/eglimage.c
+++ b/src/egl/main/eglimage.c
@@ -12,27 +12,38 @@
 /**
  * Parse the list of image attributes and return the proper error code.
  */
-static EGLint
-_eglParseImageAttribList(_EGLImage *img, const EGLint *attrib_list)
+EGLint
+_eglParseImageAttribList(_EGLImageAttribs *attrs, _EGLDisplay *dpy,
+                         const EGLint *attrib_list)
 {
    EGLint i, err = EGL_SUCCESS;
 
+   (void) dpy;
+
+   memset(attrs, 0, sizeof(attrs));
+   attrs->ImagePreserved = EGL_FALSE;
+   attrs->GLTextureLevel = 0;
+   attrs->GLTextureZOffset = 0;
+
    if (!attrib_list)
-      return EGL_SUCCESS;
+      return err;
 
    for (i = 0; attrib_list[i] != EGL_NONE; i++) {
       EGLint attr = attrib_list[i++];
       EGLint val = attrib_list[i];
 
       switch (attr) {
+      /* EGL_KHR_image_base */
       case EGL_IMAGE_PRESERVED_KHR:
-         img->Preserved = val;
+         attrs->ImagePreserved = val;
          break;
+
+      /* EGL_KHR_gl_image */
       case EGL_GL_TEXTURE_LEVEL_KHR:
-         img->GLTextureLevel = val;
+         attrs->GLTextureLevel = val;
          break;
       case EGL_GL_TEXTURE_ZOFFSET_KHR:
-         img->GLTextureZOffset = val;
+         attrs->GLTextureZOffset = val;
          break;
       default:
          /* unknown attrs are ignored */
@@ -50,21 +61,11 @@ _eglParseImageAttribList(_EGLImage *img, const EGLint *attrib_list)
 
 
 EGLBoolean
-_eglInitImage(_EGLImage *img, _EGLDisplay *dpy, const EGLint *attrib_list)
+_eglInitImage(_EGLImage *img, _EGLDisplay *dpy)
 {
-   EGLint err;
-
    memset(img, 0, sizeof(_EGLImage));
    img->Resource.Display = dpy;
 
-   img->Preserved = EGL_FALSE;
-   img->GLTextureLevel = 0;
-   img->GLTextureZOffset = 0;
-
-   err = _eglParseImageAttribList(img, attrib_list);
-   if (err != EGL_SUCCESS)
-      return _eglError(err, "eglCreateImageKHR");
-
    return EGL_TRUE;
 }
 
diff --git a/src/egl/main/eglimage.h b/src/egl/main/eglimage.h
index 2c0fb16d1d3..356395a210a 100644
--- a/src/egl/main/eglimage.h
+++ b/src/egl/main/eglimage.h
@@ -6,6 +6,16 @@
 #include "egldisplay.h"
 
 
+struct _egl_image_attribs
+{
+   /* EGL_KHR_image_base */
+   EGLBoolean ImagePreserved;
+
+   /* EGL_KHR_gl_image */
+   EGLint GLTextureLevel;
+   EGLint GLTextureZOffset;
+};
+
 /**
  * "Base" class for device driver images.
  */
@@ -13,15 +23,16 @@ struct _egl_image
 {
    /* An image is a display resource */
    _EGLResource Resource;
-
-   EGLBoolean Preserved;
-   EGLint GLTextureLevel;
-   EGLint GLTextureZOffset;
 };
 
 
+PUBLIC EGLint
+_eglParseImageAttribList(_EGLImageAttribs *attrs, _EGLDisplay *dpy,
+                         const EGLint *attrib_list);
+
+
 PUBLIC EGLBoolean
-_eglInitImage(_EGLImage *img, _EGLDisplay *dpy, const EGLint *attrib_list);
+_eglInitImage(_EGLImage *img, _EGLDisplay *dpy);
 
 
 extern _EGLImage *
diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index b65f3b72ae5..20b67b28bc6 100644
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -24,6 +24,8 @@ typedef struct _egl_extensions _EGLExtensions;
 
 typedef struct _egl_image _EGLImage;
 
+typedef struct _egl_image_attribs _EGLImageAttribs;
+
 typedef struct _egl_mode _EGLMode;
 
 typedef struct _egl_resource _EGLResource;
diff --git a/src/gallium/state_trackers/egl/common/egl_g3d_image.c b/src/gallium/state_trackers/egl/common/egl_g3d_image.c
index 558638e72f0..dcabac6bb4e 100644
--- a/src/gallium/state_trackers/egl/common/egl_g3d_image.c
+++ b/src/gallium/state_trackers/egl/common/egl_g3d_image.c
@@ -245,7 +245,7 @@ egl_g3d_create_image(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx,
       return NULL;
    }
 
-   if (!_eglInitImage(&gimg->base, dpy, attribs)) {
+   if (!_eglInitImage(&gimg->base, dpy)) {
       FREE(gimg);
       return NULL;
    }
@@ -316,7 +316,7 @@ egl_g3d_create_drm_image(_EGLDriver *drv, _EGLDisplay *dpy,
       return NULL;
    }
 
-   if (!_eglInitImage(&gimg->base, dpy, attribs)) {
+   if (!_eglInitImage(&gimg->base, dpy)) {
       FREE(gimg);
       return NULL;
    }