Skip to content

Commit

Permalink
Merge pull request #524 from fragcolor-xyz/guus/fixes
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
guusw authored Jan 17, 2023
2 parents b78aa74 + 979e159 commit a76b227
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,7 @@ jobs:
./bootstrap
mkdir build
cd build
# Some commits hang the linking step during one of the following targets
# Passing -DUSE_LLD=OFF will use the default mingw ld linker which doesn't have this issue
cmake -G Ninja -DUSE_LLD=OFF -DCMAKE_BUILD_TYPE=${{ steps.setup.outputs.build-type }} -DUSE_LIBBACKTRACE=${{ steps.setup.outputs.bitness == '64bits' }} ..
cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ steps.setup.outputs.build-type }} -DUSE_LIBBACKTRACE=${{ steps.setup.outputs.bitness == '64bits' }} ..
ninja ${{ steps.setup.outputs.build-target }}
- name: Test runtime (Debug)
if: ${{ steps.setup.outputs.runtime-tests == 'true' && steps.setup.outputs.build-type == 'Debug' }}
Expand Down
2 changes: 1 addition & 1 deletion src/gfx/drawable_processors/mesh_drawable_processor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ struct MeshDrawableProcessor final : public IDrawableProcessor {
void waitForBufferMap(Context &context, PrepareData *prepareData) {
do {
bool everythingMapped = true;
auto check = [&](auto buffers) {
auto check = [&](auto& buffers) {
for (auto &drawBuffer : buffers) {
if (drawBuffer.mappingStatus == WGPUBufferMapAsyncStatus_Unknown)
everythingMapped = false;
Expand Down

0 comments on commit a76b227

Please sign in to comment.