diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_query_cache.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec064a0e34..48544aeaec 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -185,7 +185,7 @@ else() add_compile_definitions(_FILE_OFFSET_BITS=64) endif() - if (YUZU_STATIC_BUILD AND NOT APPLE) + if (YUZU_STATIC_BUILD AND NOT APPLE AND NOT MSVC) add_compile_options(-static) # yuzu-cmd requires us to explicitly link libpthread, libgcc, and libstdc++ as static diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index eaa6912f0d..60e0e8449b 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -811,7 +811,7 @@ void BufferCache<P>::BindHostVertexBuffers() { auto& flags = maxwell3d->dirty.flags; u32 enabled_mask = enabled_vertex_buffers_mask; HostBindings<Buffer> bindings{}; - u32 last_index = std::numeric_limits<u32>::max(); + u32 last_index = (std::numeric_limits<u32>::max)(); const auto flush_bindings = [&]() { if (bindings.buffers.empty()) { return; @@ -819,7 +819,7 @@ void BufferCache<P>::BindHostVertexBuffers() { bindings.max_index = bindings.min_index + static_cast<u32>(bindings.buffers.size()); runtime.BindVertexBuffers(bindings); bindings = HostBindings<Buffer>{}; - last_index = std::numeric_limits<u32>::max(); + last_index = (std::numeric_limits<u32>::max)(); }; while (enabled_mask != 0) { const u32 index = std::countr_zero(enabled_mask); diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cpp index 9543c65bd4..98062a78dc 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp @@ -951,7 +951,7 @@ private: runtime.View3DRegs([this](Maxwell3D& maxwell3d) { buffers_count = 0; out_topology = maxwell3d.draw_manager.draw_state.topology; - patch_vertices = std::max(maxwell3d.regs.patch_vertices, 1U); + patch_vertices = (std::max)(maxwell3d.regs.patch_vertices, 1U); if (out_topology == Maxwell3D::Regs::PrimitiveTopology::Patches) { switch (maxwell3d.regs.tessellation.params.output_primitives.Value()) { case Maxwell3D::Regs::Tessellation::OutputPrimitives::Points: @@ -1145,7 +1145,7 @@ public: } new_query->stride = 1; runtime.View3DRegs([new_query, subreport](Maxwell3D& maxwell3d) { - new_query->patch_vertices = std::max(maxwell3d.regs.patch_vertices, 1U); + new_query->patch_vertices = (std::max)(maxwell3d.regs.patch_vertices, 1U); for (size_t i = 0; i < Maxwell3D::Regs::NumTransformFeedbackBuffers; i++) { const auto& tf = maxwell3d.regs.transform_feedback; if (tf.buffers[i].enable == 0) { |