Skip to content
Snippets Groups Projects
Commit afee36aa authored by Jens Koenen's avatar Jens Koenen
Browse files

Fixed the stb implementation bug by disabling all exporters provided by...

Fixed the stb implementation bug by disabling all exporters provided by assimp. Besides that fixed some layout mistakes and renamed a function.
parent a5dedb9f
No related branches found
No related tags found
1 merge request!13Clean Up
......@@ -383,6 +383,7 @@ message(">>> assimp")
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
set(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE BOOL "" FORCE)
set(ASSIMP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(ASSIMP_NO_EXPORT ON CACHE BOOL "" FORCE)
set(ASSIMP_COVERALLS OFF CACHE BOOL "" FORCE)
set(ASSIMP_INSTALL OFF CACHE BOOL "" FORCE)
set(ASSIMP_INJECT_DEBUG_POSTFIX OFF CACHE BOOL "" FORCE)
......
......@@ -17,9 +17,9 @@ namespace lava {
pass = make_render_pass(target->get_device());
{
auto color_attachment = make_attachment(target->get_format());
color_attachment->set_op(clear_target ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_STORE);
color_attachment->set_op(clear_enabled ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_STORE);
color_attachment->set_stencil_op(VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_DONT_CARE);
color_attachment->set_layouts(clear_target ? VK_IMAGE_LAYOUT_UNDEFINED : VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
color_attachment->set_layouts(clear_enabled ? VK_IMAGE_LAYOUT_UNDEFINED : VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
pass->add(color_attachment);
auto depth_attachment = make_attachment(*depth_format);
......
......@@ -18,8 +18,8 @@ namespace lava {
bool create(render_target::ptr target);
void destroy();
void set_clear_target(bool clear) {
clear_target = clear;
void set_clear_enabled(bool enabled) {
clear_enabled = enabled;
}
render_pass::ptr get_pass() const {
......@@ -34,7 +34,7 @@ namespace lava {
}
private:
bool clear_target = false;
bool clear_enabled = true;
render_target::ptr target;
render_pass::ptr pass;
......
......@@ -41,7 +41,7 @@ bool VRApplication::setup(lava::name name, argh::parser cmd_line)
}
this->app.emplace(config);
this->app->shading.set_clear_target(false);
this->app->shading.set_clear_enabled(false);
this->app->manager.on_create_param = [this](lava::device::create_param& parameters)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment