summaryrefslogtreecommitdiffstats
path: root/gpu/gles2_conform_support
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 07:01:11 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 07:01:11 +0000
commit4eb2f2630d82f0ebd859092a99c7e900dc9360f5 (patch)
tree15b5b20e24922099088ec14b47bf1300b7f3934e /gpu/gles2_conform_support
parent40ebd495498f0a245df88985436250562c927aa7 (diff)
downloadchromium_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 'gpu/gles2_conform_support')
-rw-r--r--gpu/gles2_conform_support/egl/display.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index ed72c01..34e48639 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -113,7 +113,6 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL,
NULL,
- NULL,
true));
decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));