From 31134cd4804ca19a7057129aeff1d061c4bc8e22 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Fri, 14 Dec 2012 09:58:45 -0800
Subject: [PATCH] Merge extensions as published at khronos.org

No significant changes. The extensions now have assigned extensions
numbers. And Jon Leech added missing suffixes in the declaration of
eglSetBlobCacheFuncsANDROID; our header and code already had the
suffix.

Change-Id: I2faad8ebe0ca81b13e29729a15515ee6b17b94b2
---
 opengl/specs/EGL_ANDROID_blob_cache.txt          | 11 +++++++----
 opengl/specs/EGL_ANDROID_framebuffer_target.txt  |  2 +-
 opengl/specs/EGL_ANDROID_image_native_buffer.txt |  2 +-
 opengl/specs/EGL_ANDROID_native_fence_sync.txt   |  2 +-
 opengl/specs/EGL_ANDROID_recordable.txt          |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/opengl/specs/EGL_ANDROID_blob_cache.txt b/opengl/specs/EGL_ANDROID_blob_cache.txt
index 98da00d63..e9846943d 100644
--- a/opengl/specs/EGL_ANDROID_blob_cache.txt
+++ b/opengl/specs/EGL_ANDROID_blob_cache.txt
@@ -20,11 +20,11 @@ Status
 
 Version
 
-    Version 2, April 25, 2011
+    Version 3, December 13, 2012
 
 Number
 
-    EGL Extension #XXX
+    EGL Extension #48
 
 Dependencies
 
@@ -88,8 +88,8 @@ New Types
 New Procedures and Functions
 
     void eglSetBlobCacheFuncsANDROID(EGLDisplay dpy,
-                                     EGLSetBlobFunc set,
-                                     EGLGetBlobFunc get);
+                                     EGLSetBlobFuncANDROID set,
+                                     EGLGetBlobFuncANDROID get);
 
 New Tokens
 
@@ -200,6 +200,9 @@ Issues
 
 Revision History
 
+#3 (Jon Leech, December 13, 2012)
+    - Fix typo in New Functions section & assign extension #.
+
 #2 (Jamie Gennis, April 25, 2011)
     - Swapped the order of the size and pointer arguments to the get and set
       functions.
diff --git a/opengl/specs/EGL_ANDROID_framebuffer_target.txt b/opengl/specs/EGL_ANDROID_framebuffer_target.txt
index 5a301aaff..a15dfa8f0 100644
--- a/opengl/specs/EGL_ANDROID_framebuffer_target.txt
+++ b/opengl/specs/EGL_ANDROID_framebuffer_target.txt
@@ -24,7 +24,7 @@ Version
 
 Number
 
-    EGL Extension #XXX
+    EGL Extension #47
 
 Dependencies
 
diff --git a/opengl/specs/EGL_ANDROID_image_native_buffer.txt b/opengl/specs/EGL_ANDROID_image_native_buffer.txt
index 146615ff4..7392d4f1c 100644
--- a/opengl/specs/EGL_ANDROID_image_native_buffer.txt
+++ b/opengl/specs/EGL_ANDROID_image_native_buffer.txt
@@ -26,7 +26,7 @@ Version
 
 Number
 
-    EGL Extension #XXX
+    EGL Extension #49
 
 Dependencies
 
diff --git a/opengl/specs/EGL_ANDROID_native_fence_sync.txt b/opengl/specs/EGL_ANDROID_native_fence_sync.txt
index 976207e69..d72edd771 100644
--- a/opengl/specs/EGL_ANDROID_native_fence_sync.txt
+++ b/opengl/specs/EGL_ANDROID_native_fence_sync.txt
@@ -24,7 +24,7 @@ Version
 
 Number
 
-    EGL Extension #XXX
+    EGL Extension #50
 
 Dependencies
 
diff --git a/opengl/specs/EGL_ANDROID_recordable.txt b/opengl/specs/EGL_ANDROID_recordable.txt
index e4aaa4bfa..d21094efd 100644
--- a/opengl/specs/EGL_ANDROID_recordable.txt
+++ b/opengl/specs/EGL_ANDROID_recordable.txt
@@ -24,7 +24,7 @@ Version
 
 Number
 
-    EGL Extension #XXX
+    EGL Extension #51
 
 Dependencies