diff options
| author | reveman <reveman@chromium.org> | 2015-10-19 16:38:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-19 23:39:22 +0000 |
| commit | 44429f23f3899d52c9493c114ae9b62e1ddeb7af (patch) | |
| tree | e74bae28607a9c238eaf3e3ec2c4f1466f7d61e3 /content/common/gpu/media/android_deferred_rendering_backing_strategy.cc | |
| parent | ca96543ef138fe76457b5103bb02eebfde401387 (diff) | |
| download | chromium_src-44429f23f3899d52c9493c114ae9b62e1ddeb7af.zip chromium_src-44429f23f3899d52c9493c114ae9b62e1ddeb7af.tar.gz chromium_src-44429f23f3899d52c9493c114ae9b62e1ddeb7af.tar.bz2 | |
Revert of ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (patchset #15 id:280001 of https://codereview.chromium.org/1401423003/ )
Reason for revert:
Causing android gpu bots to fail
Original issue's description:
> ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.
>
> This allows the GPU service to properly track the memory usage
> image backed textures.
>
> It also reduces the complexity of GLImage implementations
> significantly and makes it easier to support format and
> buffer types that require a copy or conversion of data to
> be used for sampling.
>
> This change also includes a few minor GLImage cleanups such
> as removing gfx:: namespace prefix in places where it's not
> needed and making the CopyTexImage GLImage test not part of
> the core GLImage tests as it's optional to support that
> function.
>
> BUG=526298
> TEST=gl_tests --gtest_filter=GpuMemoryBuffer*, gpu_unittests, gl_unittests --gtest_filter=GLImage*
>
> Committed: https://crrev.com/ac2696e324bda3824952148f831e76a8b80594b3
> Cr-Commit-Position: refs/heads/master@{#354870}
TBR=dcastagna@chromium.org,ericrk@chromium.org,fsamuel@chromium.org,liberato@chromium.org,sievers@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=526298
Review URL: https://codereview.chromium.org/1418483003
Cr-Commit-Position: refs/heads/master@{#354914}
Diffstat (limited to 'content/common/gpu/media/android_deferred_rendering_backing_strategy.cc')
| -rw-r--r-- | content/common/gpu/media/android_deferred_rendering_backing_strategy.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc b/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc index db83791..cdfc7af 100644 --- a/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc +++ b/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc @@ -110,7 +110,7 @@ void AndroidDeferredRenderingBackingStrategy::SetImageForPicture( } texture_manager->SetLevelImage(texture_ref, GetTextureTarget(), 0, - image.get(), gpu::gles2::Texture::UNBOUND); + image.get()); } void AndroidDeferredRenderingBackingStrategy::UseCodecBufferForPictureBuffer( |