Mathias Agopian
f4a079f663
* Filament Error Handling Remediation and noexcept Cleanup - Replaced assert_invariant with FILAMENT_CHECK_PRECONDITION in Renderer::beginFrame for caller bugs. - Removed noexcept from Camera::setCustomProjection to allow precondition checks to throw. - Removed noexcept from Texture and InstanceBuffer methods using precondition checks. - Documented silent clamping in View::setBloomOptions. - Clarified comment in FrameGraphResources regarding preconditions. - Refined MaterialInstance::commit to split texture loop into check and update passes, preventing partial state changes on precondition failure. * backend: Propagate backend thread exceptions to the main thread. Introduce a mechanism to catch exceptions thrown on the backend thread and rethrow them on the main thread. This prevents deadlocks and allows the application to handle fatal backend failures gracefully. - Consolidate synchronization primitives in DriverBase. - Add mHasUnrecoverableError flag to interrupt blocked fence waits. - Optimize waitForFence to avoid extra atomic reads in common paths. - Propagate FenceStatus::ERROR across all backends. - CommandBufferQueue now stores a std::exception_ptr when the backend fails. - The backend enters a "zombie" state on failure, skipping further command execution but allowing clean shutdown. - Public APIs in Renderer and Engine now check for stored exceptions and rethrow them, documented with @throws. - Guarded by __EXCEPTIONS to ensure no overhead when exceptions are disabled. - Add unit test for fence interruption and document new APIs. BUGS=[407545700] * feat: harden backend exceptions and add hasUnrecoverableFailure API - Update Renderer::beginFrame() and Renderer::shouldRenderFrame() to return false early if an unrecoverable backend exception has been delivered to the main thread. - Document the new return behavior for beginFrame() and shouldRenderFrame() in Renderer.h. - Add Engine::hasUnrecoverableFailure() to the public API to allow apps to check for fatal errors without relying on exceptions. - Implement hasUnrecoverableFailure() in FEngine by delegating to CommandBufferQueue. - Expose Engine::hasUnrecoverableFailure() to Java bindings (Engine.java and JNI). - Expose Engine::hasUnrecoverableFailure() to JavaScript bindings (jsbindings.cpp). * java: propagate C++ Panics & exceptions to JAVA
106 lines
3.7 KiB
C++
106 lines
3.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 <jni.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <filament/IndexBuffer.h>
|
|
#include <common/JniUtils.h>
|
|
|
|
#include <backend/BufferDescriptor.h>
|
|
|
|
#include "common/CallbackUtils.h"
|
|
#include "common/NioUtils.h"
|
|
|
|
using namespace filament;
|
|
using namespace backend;
|
|
using namespace filament::android;
|
|
|
|
extern "C" JNIEXPORT jlong JNICALL
|
|
Java_com_google_android_filament_IndexBuffer_nCreateBuilder(JNIEnv *env, jclass type) {
|
|
return (jlong) new IndexBuffer::Builder();
|
|
}
|
|
|
|
extern "C" JNIEXPORT void JNICALL
|
|
Java_com_google_android_filament_IndexBuffer_nDestroyBuilder(JNIEnv *env, jclass type,
|
|
jlong nativeBuilder) {
|
|
IndexBuffer::Builder* builder = (IndexBuffer::Builder *) nativeBuilder;
|
|
delete builder;
|
|
}
|
|
|
|
extern "C" JNIEXPORT void JNICALL
|
|
Java_com_google_android_filament_IndexBuffer_nBuilderIndexCount(JNIEnv *env, jclass type,
|
|
jlong nativeBuilder, jint indexCount) {
|
|
IndexBuffer::Builder* builder = (IndexBuffer::Builder *) nativeBuilder;
|
|
builder->indexCount((uint32_t) indexCount);
|
|
}
|
|
|
|
extern "C" JNIEXPORT void JNICALL
|
|
Java_com_google_android_filament_IndexBuffer_nBuilderBufferType(JNIEnv *env, jclass type,
|
|
jlong nativeBuilder, jint indexType) {
|
|
using IndexType = IndexBuffer::IndexType;
|
|
IndexBuffer::Builder* builder = (IndexBuffer::Builder *) nativeBuilder;
|
|
IndexType types[] = {IndexType::USHORT, IndexType::UINT};
|
|
builder->bufferType(types[indexType & 1]);
|
|
}
|
|
|
|
extern "C" JNIEXPORT jlong JNICALL
|
|
Java_com_google_android_filament_IndexBuffer_nBuilderBuild(JNIEnv *env, jclass type,
|
|
jlong nativeBuilder, jlong nativeEngine) {
|
|
IndexBuffer::Builder* builder = (IndexBuffer::Builder *) nativeBuilder;
|
|
Engine *engine = (Engine *) nativeEngine;
|
|
return wrapJni<jlong>(env, [=]() {
|
|
return (jlong) builder->build(*engine);
|
|
});
|
|
}
|
|
|
|
extern "C" JNIEXPORT jint JNICALL
|
|
Java_com_google_android_filament_IndexBuffer_nGetIndexCount(JNIEnv *env, jclass type,
|
|
jlong nativeIndexBuffer) {
|
|
IndexBuffer *indexBuffer = (IndexBuffer *) nativeIndexBuffer;
|
|
return (jint) indexBuffer->getIndexCount();
|
|
}
|
|
|
|
extern "C" JNIEXPORT int JNICALL
|
|
Java_com_google_android_filament_IndexBuffer_nSetBuffer(JNIEnv *env, jclass type,
|
|
jlong nativeIndexBuffer, jlong nativeEngine, jobject buffer, int remaining,
|
|
jint destOffsetInBytes, jint count,
|
|
jobject handler, jobject runnable) {
|
|
IndexBuffer *indexBuffer = (IndexBuffer *) nativeIndexBuffer;
|
|
Engine *engine = (Engine *) nativeEngine;
|
|
|
|
AutoBuffer nioBuffer(env, buffer, count);
|
|
void* data = nioBuffer.getData();
|
|
size_t sizeInBytes = nioBuffer.getSize();
|
|
if (sizeInBytes > (remaining << nioBuffer.getShift())) {
|
|
// BufferOverflowException
|
|
return -1;
|
|
}
|
|
|
|
auto* callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
|
|
|
|
BufferDescriptor desc(data, sizeInBytes,
|
|
callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
|
|
|
|
wrapJni(env, [&]() {
|
|
indexBuffer->setBuffer(*engine, std::move(desc), (uint32_t) destOffsetInBytes);
|
|
});
|
|
|
|
return 0;
|
|
}
|