Commit eb57b742 authored by Florian Oetke's avatar Florian Oetke
Browse files

switched travis to ninja and fixed clang compiler error

parent 1ca0be39
......@@ -6,7 +6,6 @@
if [ $ANALYZE = "true" ]; then
if [ "$CC" = "clang" ]; then
docker exec build scan-build --use-c++=clang++ cmake -DMIRRAGE_FORCE_LIBCPP=ON -G "Unix Makefiles" -H/repo -B/build
docker exec build scan-build --use-c++=clang++ cmake -DMIRRAGE_FORCE_LIBCPP=ON -G "Unix Makefiles" -H/repo -B/build
docker exec build scan-build --use-c++=clang++ -enable-checker deadcode.DeadStores \
-enable-checker security.insecureAPI.UncheckedReturn \
......@@ -14,8 +13,7 @@ if [ $ANALYZE = "true" ]; then
cmake --build /build
fi
else
docker exec build cmake -H/repo -B/build
docker exec build cmake -H/repo -B/build
docker exec build cmake -GNinja -DCMAKE_BUILD_TYPE=Release -H/repo -B/build
docker exec build cmake --build /build
fi
......@@ -115,12 +115,10 @@ namespace mirrage::asset {
auto albedo = load_tex(data.albedo_aid);
auto mat_data = load_tex(data.mat_data_aid);
using Tex_task = decltype(albedo.internal_task());
auto all_loaded = async::when_all(albedo.internal_task(), mat_data.internal_task());
using Task_type = decltype(all_loaded)::result_type;
return async::when_all(albedo.internal_task(), mat_data.internal_task()).then([
=,
desc_set = std::move(desc_set)
](std::tuple<Tex_task, Tex_task>) mutable {
return all_loaded.then([=, desc_set = std::move(desc_set)](const Task_type&) mutable {
return renderer::Material(_device, std::move(desc_set), _sampler, albedo, mat_data, sub_id);
});
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment