diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:01:11 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:01:11 +0000 |
| commit | 4eb2f2630d82f0ebd859092a99c7e900dc9360f5 (patch) | |
| tree | 15b5b20e24922099088ec14b47bf1300b7f3934e /third_party | |
| parent | 40ebd495498f0a245df88985436250562c927aa7 (diff) | |
| download | chromium_src-4eb2f2630d82f0ebd859092a99c7e900dc9360f5.zip chromium_src-4eb2f2630d82f0ebd859092a99c7e900dc9360f5.tar.gz chromium_src-4eb2f2630d82f0ebd859092a99c7e900dc9360f5.tar.bz2 | |
Revert 162654 - gpu: Add support for GLX_EXT_texture_from_pixmap extension.
Implement CHROMIUM_texture_from_image. This extension behaves just like
EXT_texture_from_pixmap but uses chromium specific image identifiers rather
than platform specific pixmap IDs.
Add IPC message for creating an image identifier using a
gfx::PluginWindowHandle. Each GPU channel maintains a different set of
images and deleting an image will cause the internal image representation
to be freed once it's no longer bound to a texture.
BUG=132342
TEST=gpu_unittests --gtest_filter=TextureInfoTest.GetLevelImage:GLES2DecoderTest.BindTexImage2DCHROMIUM:GLES2DecoderTest.ReleaseTexImage2DCHROMIUM and manual
Review URL: https://chromiumcodereview.appspot.com/10543125
TBR=reveman@chromium.org
Review URL: https://codereview.chromium.org/11188053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 16 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index a452f3f..fee1192 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -2037,22 +2037,6 @@ typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUM) (GLuint program, GL #endif #endif -/* GL_CHROMIUM_texture_from_image */ -#ifndef GL_CHROMIUM_texture_from_image -#define GL_CHROMIUM_texture_from_image 1 -#ifdef GL_GLEXT_PROTOTYPES -#define glBindTexImage2DCHROMIUM GLES2_GET_FUN(BindTexImage2DCHROMIUM) -#define glReleaseTexImage2DCHROMIUM GLES2_GET_FUN(ReleaseTexImage2DCHROMIUM) -#if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL void GL_APIENTRY glBindTexImage2DCHROMIUM (GLenum target, GLint imageId); -GL_APICALL void GL_APIENTRY glReleaseTexImage2DCHROMIUM (GLenum target, GLint imageId); -#endif -#else -typedef void (GL_APIENTRYP PFNGLBINDTEXIMAGE2DCHROMIUM) (GLenum target, GLint imageId); -typedef void (GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUM) (GLenum target, GLint imageId); -#endif -#endif - #ifdef __cplusplus } #endif diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 4128e35..f49e752 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -27,7 +27,6 @@ GLES2/gl2ext.h - Added GL_CHROMIUM_copy_texture - Added GL_CHROMIUM_bind_uniform_location - Added GL_CHROMIUM_get_error_query - - Added GL_CHROMIUM_texture_from_image - Added GL_NVX_gpu_memory_info EGL/eglplatform.h - Added EGLNative*Type for Mac. |