Revert accidental Vulkan diagnostic commit.
This reverts commit 59a6758fce.
This commit is contained in:
@@ -129,7 +129,7 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
|
||||
scene.addEntity(light)
|
||||
}
|
||||
|
||||
constructor(surfaceView: SurfaceView, engine: Engine = Engine.create(Engine.Backend.VULKAN), manipulator: Manipulator? = null) : this(engine) {
|
||||
constructor(surfaceView: SurfaceView, engine: Engine = Engine.create(), manipulator: Manipulator? = null) : this(engine) {
|
||||
cameraManipulator = manipulator ?: Manipulator.Builder()
|
||||
.targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
|
||||
.viewport(surfaceView.width, surfaceView.height)
|
||||
|
||||
@@ -29,9 +29,6 @@ android {
|
||||
targetSdkVersion versions.targetSdk
|
||||
missingDimensionStrategy 'functionality', 'full'
|
||||
}
|
||||
sourceSets.main.jniLibs {
|
||||
srcDirs = ["/Users/prideout/Library/Android/sdk/ndk/22.1.7171670/sources/third_party/vulkan/src/build-android/jniLibs"]
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
// }
|
||||
//
|
||||
#if defined(NDEBUG)
|
||||
#define VK_ENABLE_VALIDATION 1
|
||||
#define VK_ENABLE_VALIDATION 0
|
||||
#else
|
||||
#define VK_ENABLE_VALIDATION 1
|
||||
#endif
|
||||
|
||||
@@ -52,7 +52,6 @@ int main(int argc, char** argv) {
|
||||
Config config;
|
||||
config.title = "hellopbr";
|
||||
config.iblDirectory = FilamentApp::getRootAssetsPath() + IBL_FOLDER;
|
||||
config.backend = Backend::VULKAN;
|
||||
|
||||
App app;
|
||||
auto setup = [config, &app](Engine* engine, View* view, Scene* scene) {
|
||||
|
||||
@@ -65,7 +65,6 @@ static constexpr uint16_t TRIANGLE_INDICES[3] = { 0, 1, 2 };
|
||||
int main(int argc, char** argv) {
|
||||
Config config;
|
||||
config.title = "hellotriangle";
|
||||
config.backend = Engine::Backend::VULKAN;
|
||||
|
||||
App app;
|
||||
auto setup = [&app](Engine* engine, View* view, Scene* scene) {
|
||||
|
||||
Reference in New Issue
Block a user