diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 03:58:07 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 03:58:07 +0000 |
| commit | 4f9958143b76ecb130820cc5e4edbd820640676e (patch) | |
| tree | 09bf3f5c10f261f3f6aac2fb6de038c750d67619 /gpu/gles2_conform_support | |
| parent | 508b89a64ab700aa09f21fc666a5588b47360eab (diff) | |
| download | chromium_src-4f9958143b76ecb130820cc5e4edbd820640676e.zip chromium_src-4f9958143b76ecb130820cc5e4edbd820640676e.tar.gz chromium_src-4f9958143b76ecb130820cc5e4edbd820640676e.tar.bz2 | |
Fix stream textures + mailboxes
DestroyStreamTexture was called from DeleteTextures, which is awkward because it doesn't mean the texture is actually deleted.
Instead, rationalize StreamTexture ownership, by making it associated with the TextureRef (i.e. client id) that created it. When the TextureRef is destroyed and the stream texture wasn't explicitly destroyed yet, it gets destroyed implicitly at this point.
The StreamTextureManager still maps StreamTextures by service id, so that multiple TextureRef in the same ContextGroup (in practice, in the same channel actually) will still allow updates on bind.
This also makes explicit the fact that the StreamTextureManager is shared per ContxtGroup, since we rely on that for Update.
BUG=254494
Review URL: https://chromiumcodereview.appspot.com/18430002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/egl/display.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc index 5288a9b..3c06259 100644 --- a/gpu/gles2_conform_support/egl/display.cc +++ b/gpu/gles2_conform_support/egl/display.cc @@ -113,7 +113,7 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config, return NULL; scoped_refptr<gpu::gles2::ContextGroup> group( - new gpu::gles2::ContextGroup(NULL, NULL, NULL, true)); + new gpu::gles2::ContextGroup(NULL, NULL, NULL, NULL, true)); decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get())); if (!decoder_.get()) |