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 /content/renderer | |
| 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 'content/renderer')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 11 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.h | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 57af88c..81da444 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -963,17 +963,6 @@ int32 RenderThreadImpl::CreateViewCommandBuffer( return route_id; } -void RenderThreadImpl::CreateImage( - gfx::PluginWindowHandle window, - int32 image_id, - const CreateImageCallback& callback) { - NOTREACHED(); -} - -void RenderThreadImpl::DeleteImage(int32 image_id, int32 sync_point) { - NOTREACHED(); -} - void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { suspend_webkit_shared_timer_ = false; } diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 4c08164..1e3d984 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -153,11 +153,6 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread, virtual int32 CreateViewCommandBuffer( int32 surface_id, const GPUCreateCommandBufferConfig& init_params) OVERRIDE; - virtual void CreateImage( - gfx::PluginWindowHandle window, - int32 image_id, - const CreateImageCallback& callback) OVERRIDE; - virtual void DeleteImage(int32 image_id, int32 sync_point) OVERRIDE; // Synchronously establish a channel to the GPU plugin if not previously // established or if it has been lost (for example if the GPU plugin crashed). |