aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/engines/maxwell_3d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/engines/maxwell_3d.cpp')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index 0d47b032c8..c63f908bcc 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -245,15 +245,15 @@ u32 Maxwell3D::GetMaxCurrentVertices() {
}
const auto& attribute = regs.vertex_attrib_format[index];
if (attribute.constant) {
- num_vertices = std::max(num_vertices, 1U);
+ num_vertices = (std::max)(num_vertices, 1U);
continue;
}
const auto& limit = regs.vertex_stream_limits[index];
const GPUVAddr gpu_addr_begin = array.Address();
const GPUVAddr gpu_addr_end = limit.Address() + 1;
const u32 address_size = static_cast<u32>(gpu_addr_end - gpu_addr_begin);
- num_vertices = std::max(
- num_vertices, address_size / std::max(attribute.SizeInBytes(), array.stride.Value()));
+ num_vertices = (std::max)(
+ num_vertices, address_size / (std::max)(attribute.SizeInBytes(), array.stride.Value()));
break;
}
return num_vertices;
@@ -262,9 +262,9 @@ u32 Maxwell3D::GetMaxCurrentVertices() {
size_t Maxwell3D::EstimateIndexBufferSize() {
GPUVAddr start_address = regs.index_buffer.StartAddress();
GPUVAddr end_address = regs.index_buffer.EndAddress();
- static constexpr std::array<size_t, 3> max_sizes = {std::numeric_limits<u8>::max(),
- std::numeric_limits<u16>::max(),
- std::numeric_limits<u32>::max()};
+ static constexpr std::array<size_t, 3> max_sizes = {(std::numeric_limits<u8>::max)(),
+ (std::numeric_limits<u16>::max)(),
+ (std::numeric_limits<u32>::max)()};
const size_t byte_size = regs.index_buffer.FormatSizeInBytes();
const size_t log2_byte_size = Common::Log2Ceil64(byte_size);
const size_t cap{GetMaxCurrentVertices() * 4 * byte_size};