dri: Remove image write function

[profile/ivi/mesa.git] / include / GL / internal / dri_interface.h

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 82e5fde..e766226 100644 (file)
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -800,8 +800,8 @@ struct __DRIdri2LoaderExtensionRec {
 #define __DRI_DRI2_VERSION 3
 
 #define __DRI_API_OPENGL       0       /**< OpenGL compatibility profile */
-#define __DRI_API_GLES         1
-#define __DRI_API_GLES2                2
+#define __DRI_API_GLES         1       /**< OpenGL ES 1.x */
+#define __DRI_API_GLES2                2       /**< OpenGL ES 2.0 or 3.0 */
 #define __DRI_API_OPENGL_CORE  3       /**< OpenGL 3.2+ core profile */
 
 #define __DRI_CTX_ATTRIB_MAJOR_VERSION         0
@@ -912,7 +912,7 @@ struct __DRIdri2ExtensionRec {
  * extensions.
  */
 #define __DRI_IMAGE "DRI_IMAGE"
-#define __DRI_IMAGE_VERSION 4
+#define __DRI_IMAGE_VERSION 5
 
 /**
  * These formats correspond to the similarly named MESA_FORMAT_*
@@ -935,8 +935,7 @@ struct __DRIdri2ExtensionRec {
 
 #define __DRI_IMAGE_USE_SHARE          0x0001
 #define __DRI_IMAGE_USE_SCANOUT                0x0002
-#define __DRI_IMAGE_USE_CURSOR         0x0004
-#define __DRI_IMAGE_USE_WRITE          0x0008
+#define __DRI_IMAGE_USE_CURSOR         0x0004 /* Depricated */
 
 /**
  * queryImage attributes
@@ -946,6 +945,8 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_ATTRIB_HANDLE      0x2001
 #define __DRI_IMAGE_ATTRIB_NAME                0x2002
 #define __DRI_IMAGE_ATTRIB_FORMAT      0x2003 /* available in versions 3+ */
+#define __DRI_IMAGE_ATTRIB_WIDTH       0x2004 /* available in versions 5+ */
+#define __DRI_IMAGE_ATTRIB_HEIGHT      0x2005
 
 typedef struct __DRIimageRec          __DRIimage;
 typedef struct __DRIimageExtensionRec __DRIimageExtension;
@@ -983,13 +984,6 @@ struct __DRIimageExtensionRec {
    GLboolean (*validateUsage)(__DRIimage *image, unsigned int use);
 
    /**
-    * Write data into image.
-    *
-    * \since 4
-    */
-   int (*write)(__DRIimage *image, const void *buf, size_t count);
-
-   /**
     * Create an image out of a sub-region of a parent image.  This
     * entry point lets us create individual __DRIimages for different
     * planes in a planar buffer (typically yuv), for example.  While a