Commit e7225c31 authored by mthiesse's avatar mthiesse Committed by Commit bot

CompositorImplAndroid sets a texture size that may not be aligned FencedAllocator allocation size.

This CL ensures chunk size is aligned with the FencedAllocator allocation size.

BUG=680150
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2623223002
Cr-Commit-Position: refs/heads/master@{#443435}
parent 1a5d0781
......@@ -18,6 +18,7 @@
#include <sstream>
#include <string>
#include "base/atomic_sequence_num.h"
#include "base/bits.h"
#include "base/compiler_specific.h"
#include "base/numerics/safe_math.h"
#include "base/strings/string_split.h"
......@@ -219,6 +220,8 @@ bool GLES2Implementation::Initialize(
if (mapped_memory_limit != SharedMemoryLimits::kNoLimit) {
// Use smaller chunks if the client is very memory conscientious.
chunk_size = std::min(mapped_memory_limit / 4, chunk_size);
chunk_size = base::bits::Align(chunk_size,
FencedAllocator::kAllocAlignment);
}
mapped_memory_->set_chunk_size_multiple(chunk_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment