Change glimage to accept a type.

gpu/GLES2/extensions/CHROMIUM/CHROMIUM_image.txt

Index: gpu/GLES2/extensions/CHROMIUM/CHROMIUM_image.txt
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_map_image.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_image.txt
similarity index 68%
rename from gpu/GLES2/extensions/CHROMIUM/CHROMIUM_map_image.txt
rename to gpu/GLES2/extensions/CHROMIUM/CHROMIUM_image.txt
index 6304fdace0feeb68efe850ed3187722a73ec4ead..7a372c9cf108cdf3bd905e43c340cb8e56365173 100644
--- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_map_image.txt
+++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_image.txt
@@ -1,14 +1,14 @@
 Name
 
-    CHROMIUM_map_image
+    CHROMIUM_image
 
 Name Strings
 
-    GL_CHROMIUM_map_image
+    GL_CHROMIUM_image
 
 Version
 
-    Last Modifed Date: May 9, 2013
+    Last Modifed Date: Apr 30, 2014
 
 Dependencies
 
@@ -17,7 +17,9 @@ Dependencies
 Overview
 
     This extension allows for more efficient uploading of texture data through
-    Chromium's OpenGL ES 2.0 implementation.
+    Chromium's OpenGL ES 2.0 implementation as well as enable hardware overlay
+    support by providing ability to create buffers capable of being scanned out
+    directly by the display controller.
 
     For security reasons Chromium accesses the GPU from a separate process. User
     processes are not allowed to access the GPU directly. This multi-process
@@ -34,12 +36,22 @@ Issues
 
 New Tokens
 
-    None
+    Accepted by the <pname> parameter of GetImageParameterivCHROMIUM:
+
+    GL_IMAGE_ROWBYTES_CHROMIUM 0x78F0

[reveman, 2014/05/01 12:06:38]

nit: indent 4 spaces and remove GL_ prefix for consistency (not used when
referring to INVALID_VALUE below)

[alexst (slow to review), 2014/05/01 13:44:51]

Done.

+
+    Accepted by the <usage> parameter of CreateImageCHROMIUM:
+
+    GL_IMAGE_CPU_READ_WRITE_CHROMIUM 0x78F1
+    GL_IMAGE_SCANOUT_CHROMIUM 0x78F2

[reveman, 2014/05/01 12:06:38]

nit: indent 4 spaces and remove GL_ prefix

+
+#ifndef GL_IMAGE_SCANOUT_CHROMIUM

[reveman, 2014/05/01 12:06:38]

typo?

[alexst (slow to review), 2014/05/01 13:44:51]

right, copy paste...

+
 
 New Procedures and Functions
 
-    GLuint CreateImageCHROMIUM (GLsizei width, GLsizei height,
-                                GLenum internalformat)
+    GLuint CreateImageCHROMIUM(GLsizei width, GLsizei height,
+                               GLenum internalformat, GLenum usage)
 
     Allocate an image with width equal to <width> and height equal
     to <height> stored in format <internalformat>.
@@ -49,27 +61,27 @@ New Procedures and Functions
 
     INVALID_VALUE is generated if <width> or <height> is nonpositive.
 
-    void DestroyImageCHROMIUM (GLuint image_id)
+    INVALID_ENUM is generated if <usage> is not one of
+    GL_IMAGE_CPU_READ_WRITE_CHROMIUM and GL_IMAGE_SCANOUT_CHROMIUM.
+
+    void DestroyImageCHROMIUM(GLuint image_id)
 
     Frees the image previously allocated by a call to CreateImageCHROMIUM.
 
     INVALID_OPERATION is generated if <image_id> is not a valid image id.
 
-    void* MapImageCHROMIUM (GLuint image_id, GLenum access)
+    void* MapImageCHROMIUM(GLuint image_id)
 
     Returns a pointer to in the user memory for the application to modify
-    the image. <access> parameter defines if the user will read or write the
-    pixels.
+    the image. It is illegal to call this function on an image not created
+    with GL_IMAGE_CPU_READ_WRITE_CHROMIUM usage.
 
     INVALID_OPERATION is generated if <image_id> is not a valid image id.
 
     INVALID_OPERATION is generated if the image was already mapped by a previous
     call to this method.
 
-    INVALID_ENUM is generated if <access> is not one of WRITE_ONLY, READ_ONLY
-    and READ_WRITE.
-
-    void UnmapImageCHROMIUM (GLuint image_id)
+    void UnmapImageCHROMIUM(GLuint image_id)
 
     Removes the mapping created by a call to MapImageCHROMIUM.
 
@@ -105,3 +117,4 @@ New State
 Revision History
 
     5/9/2013    Documented the extension
+    4/30/2014   Moved usage flag to creation function.