diff options
| author | Jesse Hall <jessehall@google.com> | 2012-12-14 09:58:45 -0800 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2012-12-14 09:58:45 -0800 |
| commit | 31134cd4804ca19a7057129aeff1d061c4bc8e22 (patch) | |
| tree | c8c43b419259529d026c64eb096fa4526f729b0e /opengl/specs | |
| parent | 0e1e53e376ccb3c173ff8e5efeab39b2c5dfd6bd (diff) | |
| download | frameworks_native-31134cd4804ca19a7057129aeff1d061c4bc8e22.zip frameworks_native-31134cd4804ca19a7057129aeff1d061c4bc8e22.tar.gz frameworks_native-31134cd4804ca19a7057129aeff1d061c4bc8e22.tar.bz2 | |
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
Diffstat (limited to 'opengl/specs')
| -rw-r--r-- | opengl/specs/EGL_ANDROID_blob_cache.txt | 11 | ||||
| -rw-r--r-- | opengl/specs/EGL_ANDROID_framebuffer_target.txt | 2 | ||||
| -rw-r--r-- | opengl/specs/EGL_ANDROID_image_native_buffer.txt | 2 | ||||
| -rw-r--r-- | opengl/specs/EGL_ANDROID_native_fence_sync.txt | 2 | ||||
| -rw-r--r-- | 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 98da00d..e984694 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 5a301aa..a15dfa8 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 146615f..7392d4f 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 976207e..d72edd7 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 e4aaa4b..d21094e 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 |