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.

1 files changed, 16 insertions, 5 deletions

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 *