MaterialInstance: generate versions of setParameter() methods that are templated on the parameter sizeof(), which allows us to coalesce implementations, e.g. vec4<float> and vec4<int> are now the same. We make the compiler generate non-inline version of all these methods, the typed version just call through, taking advantage of the tail-call optimization in clang. MaterialParser: improve code to avoid calling multiple methods that all did more or less the same thing and were inlined. PostProcessManager: use a loop to initialize the materials ToneMapping: de-dup ACES implementation And other more minor optimizations. Fix alignment issues with setting booleans in UBOs
60 lines
1.7 KiB
C++
60 lines
1.7 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <filaflat/ChunkContainer.h>
|
|
|
|
#include <filaflat/Unflattener.h>
|
|
|
|
namespace filaflat {
|
|
|
|
ChunkContainer::~ChunkContainer() noexcept = default;
|
|
|
|
bool ChunkContainer::parseChunk(Unflattener& unflattener) {
|
|
uint64_t type;
|
|
if (!unflattener.read(&type)) {
|
|
return false;
|
|
}
|
|
|
|
uint32_t size;
|
|
if (!unflattener.read(&size)) {
|
|
return false;
|
|
}
|
|
|
|
// If size goes beyond the boundaries of the package, this is an invalid chunk. Discard it.
|
|
// All remaining chunks cannot be accessed and will not be mapped.
|
|
auto cursor = unflattener.getCursor();
|
|
if (!(cursor + size >= (uint8_t *)mData &&
|
|
cursor + size <= (uint8_t *)mData + mSize)) {
|
|
return false;
|
|
}
|
|
|
|
mChunks[Type(type)] = { cursor, size };
|
|
unflattener.setCursor(cursor + size);
|
|
return true;
|
|
}
|
|
|
|
bool ChunkContainer::parse() noexcept {
|
|
Unflattener unflattener((uint8_t *)mData, (uint8_t *)mData + mSize);
|
|
do {
|
|
if (!parseChunk(unflattener)) {
|
|
return false;
|
|
}
|
|
} while (unflattener.hasData());
|
|
return true;
|
|
}
|
|
|
|
} // namespace filaflat
|