| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/command_buffer/service/texture_manager.h" | 5 #include "gpu/command_buffer/service/texture_manager.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 1696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1707 current_size_[pool] += new_size - old_size; | 1707 current_size_[pool] += new_size - old_size; |
| 1708 } | 1708 } |
| 1709 | 1709 |
| 1710 bool EnsureGPUMemoryAvailable(size_t size_needed) override { return true; } | 1710 bool EnsureGPUMemoryAvailable(size_t size_needed) override { return true; } |
| 1711 | 1711 |
| 1712 size_t GetSize(Pool pool) { | 1712 size_t GetSize(Pool pool) { |
| 1713 DCHECK_LT(static_cast<size_t>(pool), arraysize(current_size_)); | 1713 DCHECK_LT(static_cast<size_t>(pool), arraysize(current_size_)); |
| 1714 return current_size_[pool]; | 1714 return current_size_[pool]; |
| 1715 } | 1715 } |
| 1716 | 1716 |
| 1717 uint64_t ClientTracingId() const override { return 0; } |
| 1718 |
| 1719 int ClientId() const override { return 0; } |
| 1720 |
| 1717 private: | 1721 private: |
| 1718 ~CountingMemoryTracker() override {} | 1722 ~CountingMemoryTracker() override {} |
| 1719 | 1723 |
| 1720 size_t current_size_[2]; | 1724 size_t current_size_[2]; |
| 1721 DISALLOW_COPY_AND_ASSIGN(CountingMemoryTracker); | 1725 DISALLOW_COPY_AND_ASSIGN(CountingMemoryTracker); |
| 1722 }; | 1726 }; |
| 1723 | 1727 |
| 1724 class SharedTextureTest : public GpuServiceTest { | 1728 class SharedTextureTest : public GpuServiceTest { |
| 1725 public: | 1729 public: |
| 1726 static const bool kUseDefaultTextures = false; | 1730 static const bool kUseDefaultTextures = false; |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2244 ExpectValid(GL_DEPTH_COMPONENT, GL_FLOAT, GL_DEPTH_COMPONENT32F); | 2248 ExpectValid(GL_DEPTH_COMPONENT, GL_FLOAT, GL_DEPTH_COMPONENT32F); |
| 2245 ExpectValid(GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8); | 2249 ExpectValid(GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8); |
| 2246 ExpectValid(GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, | 2250 ExpectValid(GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, |
| 2247 GL_DEPTH32F_STENCIL8); | 2251 GL_DEPTH32F_STENCIL8); |
| 2248 | 2252 |
| 2249 ExpectInvalid(GL_RGB_INTEGER, GL_INT, GL_RGBA8); | 2253 ExpectInvalid(GL_RGB_INTEGER, GL_INT, GL_RGBA8); |
| 2250 } | 2254 } |
| 2251 | 2255 |
| 2252 } // namespace gles2 | 2256 } // namespace gles2 |
| 2253 } // namespace gpu | 2257 } // namespace gpu |
| OLD | NEW |