Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3998)

Unified Diff: cc/test/test_gpu_memory_buffer_manager.cc

Issue 1291643002: Revert of Move NumberOfPlanesForGpuMemoryBufferFormat to gfx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/view_manager/gles2/mojo_gpu_memory_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/test_gpu_memory_buffer_manager.cc
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
index dbc9077012ebcf4d464cefb6e4b29544ef14b040..d70b74083c9ddef19ffc3f48653654935191e616 100644
--- a/cc/test/test_gpu_memory_buffer_manager.cc
+++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -6,11 +6,30 @@
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
-#include "ui/gfx/buffer_format_util.h"
#include "ui/gfx/gpu_memory_buffer.h"
namespace cc {
namespace {
+
+int 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) {
@@ -66,7 +85,7 @@
size_t BufferSizeInBytes(const gfx::Size& size, gfx::BufferFormat format) {
size_t size_in_bytes = 0;
- int num_planes = static_cast<int>(gfx::NumberOfPlanesForBufferFormat(format));
+ int num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format);
for (int i = 0; i < num_planes; ++i) {
size_in_bytes += StrideInBytes(size.width(), format, i) *
(size.height() / SubsamplingFactor(format, i));
@@ -91,8 +110,7 @@
return false;
mapped_ = true;
size_t offset = 0;
- int num_planes =
- static_cast<int>(gfx::NumberOfPlanesForBufferFormat(format_));
+ int num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_);
for (int i = 0; i < num_planes; ++i) {
data[i] = reinterpret_cast<uint8*>(shared_memory_->memory()) + offset;
offset += StrideInBytes(size_.width(), format_, i) *
@@ -108,8 +126,7 @@
bool IsMapped() const override { return mapped_; }
gfx::BufferFormat GetFormat() const override { return format_; }
void GetStride(int* stride) const override {
- int num_planes =
- static_cast<int>(gfx::NumberOfPlanesForBufferFormat(format_));
+ int num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_);
for (int i = 0; i < num_planes; ++i)
stride[i] =
base::checked_cast<int>(StrideInBytes(size_.width(), format_, i));
« no previous file with comments | « no previous file | components/view_manager/gles2/mojo_gpu_memory_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698