diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 01:51:40 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 01:51:40 +0000 |
| commit | 217f0ab8f8e255079c4d046175fdcf2413f512c9 (patch) | |
| tree | 56925f229cecf1a2dd6f3e7e742db8f8d6730ba1 /ppapi | |
| parent | ab71b35c619a573703b95d1cef5ffb408ab895be (diff) | |
| download | chromium_src-217f0ab8f8e255079c4d046175fdcf2413f512c9.zip chromium_src-217f0ab8f8e255079c4d046175fdcf2413f512c9.tar.gz chromium_src-217f0ab8f8e255079c4d046175fdcf2413f512c9.tar.bz2 | |
Add ShareGroup to GLES2Implemenation
The idea is if you don't pass a ShareGroup it will make one.
Otherwise you can do
new_gles2_impl = new GLES2Implemetation(
...,
some_other_gles2_impl_in_same_process->share_group(),
...);
TEST=unit test
BUG=120297
TBR=nfullgar@google.com,brettw@chromium.org
Review URL: http://codereview.chromium.org/9837124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc | 1 | ||||
| -rw-r--r-- | ppapi/shared_impl/ppb_graphics_3d_shared.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc index 01c14dc..33e9725 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc @@ -220,6 +220,7 @@ bool PluginGraphics3D::InitFromBrowserResource(PP_Resource res) { transfer_buffer_.reset(new gpu::TransferBuffer(gles2_helper_.get())); gles2_implementation_.reset(new gpu::gles2::GLES2Implementation( gles2_helper_.get(), + NULL, transfer_buffer_.get(), false, true)); diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.cc b/ppapi/shared_impl/ppb_graphics_3d_shared.cc index 13184eb..c539704 100644 --- a/ppapi/shared_impl/ppb_graphics_3d_shared.cc +++ b/ppapi/shared_impl/ppb_graphics_3d_shared.cc @@ -116,6 +116,7 @@ bool PPB_Graphics3D_Shared::CreateGLES2Impl(int32 command_buffer_size, // Create the object exposing the OpenGL API. gles2_impl_.reset(new gpu::gles2::GLES2Implementation( gles2_helper_.get(), + NULL, transfer_buffer_.get(), false, true)); |