From ccc61032355c3198efa69f388b84cf2f5548041b Mon Sep 17 00:00:00 2001 From: rockot Date: Tue, 11 Aug 2015 17:40:34 -0700 Subject: Revert of Move NumberOfPlanesForGpuMemoryBufferFormat to gfx (patchset #4 id:120001 of https://codereview.chromium.org/1281043006/ ) Reason for revert: This breaks Win 64 builds: http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN Original issue's description: > Move NumberOfPlanesForGpuMemoryBufferFormat to gfx > > We will need to call it from media::GpuMemoryBufferVideoFramePool when we > add support for YUV_420_BIPLANAR. > > BUG=510260 > TEST=No behavior change, only moving code. > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/85f29861d095a7c5dcf318053e8349d1efaddbab > Cr-Commit-Position: refs/heads/master@{#342942} TBR=reveman@chromium.org,ccameron@chromium.org,msw@chromium.org,jbauman@chromium.org,avi@chromium.org,andresantoso@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=510260 Review URL: https://codereview.chromium.org/1291643002 Cr-Commit-Position: refs/heads/master@{#342948} --- gpu/command_buffer/tests/gl_manager.cc | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'gpu') diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc index 5489358..3b9e170 100644 --- a/gpu/command_buffer/tests/gl_manager.cc +++ b/gpu/command_buffer/tests/gl_manager.cc @@ -30,7 +30,6 @@ #include "gpu/command_buffer/service/memory_tracking.h" #include "gpu/command_buffer/service/valuebuffer_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/buffer_format_util.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_image_ref_counted_memory.h" @@ -40,6 +39,26 @@ namespace gpu { namespace { +size_t NumberOfPlanesForGpuMemoryBufferFormat(gfx::BufferFormat format) { + switch (format) { + case gfx::BufferFormat::ATC: + case gfx::BufferFormat::ATCIA: + case gfx::BufferFormat::DXT1: + case gfx::BufferFormat::DXT5: + case gfx::BufferFormat::ETC1: + case gfx::BufferFormat::R_8: + case gfx::BufferFormat::RGBA_4444: + case gfx::BufferFormat::RGBA_8888: + case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::BGRA_8888: + return 1; + case gfx::BufferFormat::YUV_420: + return 3; + } + NOTREACHED(); + return 0; +} + size_t SubsamplingFactor(gfx::BufferFormat format, int plane) { switch (format) { case gfx::BufferFormat::ATC: @@ -97,7 +116,7 @@ size_t StrideInBytes(size_t width, gfx::BufferFormat format, int plane) { size_t BufferSizeInBytes(const gfx::Size& size, gfx::BufferFormat format) { size_t size_in_bytes = 0; - size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format); + size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format); for (size_t i = 0; i < num_planes; ++i) { size_in_bytes += StrideInBytes(size.width(), format, i) * (size.height() / SubsamplingFactor(format, i)); @@ -119,7 +138,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { // Overridden from gfx::GpuMemoryBuffer: bool Map(void** data) override { size_t offset = 0; - size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format_); + size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_); for (size_t i = 0; i < num_planes; ++i) { data[i] = reinterpret_cast(&bytes_->data().front()) + offset; offset += StrideInBytes(size_.width(), format_, i) * @@ -132,7 +151,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { bool IsMapped() const override { return mapped_; } gfx::BufferFormat GetFormat() const override { return format_; } void GetStride(int* stride) const override { - size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format_); + size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_); for (size_t i = 0; i < num_planes; ++i) stride[i] = StrideInBytes(size_.width(), format_, i); } -- cgit v1.1