Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a couple typos and consts.

Browse Source 
make it easier to activate matdbg on android builds, by adding, but
commenting out the appropriate property.
This commit is contained in:
Mathias Agopian
2023-01-31 17:24:28 -08:00
committed by Mathias Agopian
parent 0b4d32bf98
commit 4a09e13e9d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/gradle.properties
View File

@@ -22,3 +22,4 @@ android.useAndroidX=true
com.google.android.filament.tools-dir=../../../out/release/filament
com.google.android.filament.dist-dir=../out/android-release/filament
com.google.android.filament.abis=all
#com.google.android.filament.matdbg=true

2
filament/src/details/Engine.cpp
View File

@@ -505,7 +505,7 @@ void FEngine::prepare() {
SYSTRACE_CALL();
// prepare() is called once per Renderer frame. Ideally we would upload the content of
// UBOs that are visible only. It's not such a big issue because the actual upload() is
// skipped is the UBO hasn't changed. Still we could have a lot of these.
// skipped if the UBO hasn't changed. Still we could have a lot of these.
FEngine::DriverApi& driver = getDriverApi();
for (auto& materialInstanceList: mMaterialInstances) {

9
filament/src/details/Material.cpp
View File

@@ -158,7 +158,6 @@ FMaterial::FMaterial(FEngine& engine, const Material::Builder& builder)
assert_invariant(success);
// read the uniform binding list
utils::FixedCapacityVector<std::pair<utils::CString, uint8_t>> uniformBlockBindings;
success = parser->getUniformBlockBindings(&mUniformBlockBindings);
assert_invariant(success || mFeatureLevel >= FeatureLevel::FEATURE_LEVEL_2);
@@ -525,10 +524,10 @@ void FMaterial::applyPendingEdits() noexcept {
#if FILAMENT_ENABLE_MATDBG
void FMaterial::onEditCallback(void* userdata, const utils::CString& name, const void* packageData,
void FMaterial::onEditCallback(void* userdata, const utils::CString&, const void* packageData,
size_t packageSize) {
FMaterial* material = downcast((Material*) userdata);
FEngine& engine = material->mEngine;
FEngine const& engine = material->mEngine;
// This is called on a web server thread, so we defer clearing the program cache
// and swapping out the MaterialParser until the next getProgram call.
@@ -537,7 +536,7 @@ void FMaterial::onEditCallback(void* userdata, const utils::CString& name, const
void FMaterial::onQueryCallback(void* userdata, VariantList* pVariants) {
FMaterial* material = downcast((Material*) userdata);
std::lock_guard<utils::Mutex> lock(material->mActiveProgramsLock);
std::lock_guard<utils::Mutex> const lock(material->mActiveProgramsLock);
*pVariants = material->mActivePrograms;
material->mActivePrograms.reset();
}
@@ -554,7 +553,7 @@ void FMaterial::destroyPrograms(FEngine& engine) {
if (!mIsDefaultMaterial) {
// The depth variants may be shared with the default material, in which case
// we should not free it now.
bool isSharedVariant = Variant::isValidDepthVariant(variant) && !mHasCustomDepthShader;
bool const isSharedVariant = Variant::isValidDepthVariant(variant) && !mHasCustomDepthShader;
if (isSharedVariant) {
// we don't own this variant, skip.
continue;