From 44429f23f3899d52c9493c114ae9b62e1ddeb7af Mon Sep 17 00:00:00 2001 From: reveman Date: Mon, 19 Oct 2015 16:38:48 -0700 Subject: 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} --- ui/gl/gl_image_shared_memory_unittest.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'ui/gl/gl_image_shared_memory_unittest.cc') diff --git a/ui/gl/gl_image_shared_memory_unittest.cc b/ui/gl/gl_image_shared_memory_unittest.cc index 9c280f9..44c8e97 100644 --- a/ui/gl/gl_image_shared_memory_unittest.cc +++ b/ui/gl/gl_image_shared_memory_unittest.cc @@ -39,9 +39,5 @@ INSTANTIATE_TYPED_TEST_CASE_P(GLImageSharedMemory, GLImageTest, GLImageSharedMemoryTestDelegate); -INSTANTIATE_TYPED_TEST_CASE_P(GLImageSharedMemory, - GLImageCopyTest, - GLImageSharedMemoryTestDelegate); - } // namespace } // namespace gfx -- cgit v1.1