From 518f6a362473fe73b395cb4020c1f8d2eef79d2a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 19 Nov 2017 01:47:21 -0500 Subject: [PATCH] VideoCommon: Resolve -Wmissing-brace warnings Resolves around 5 -Wmissing-brace warnings on macOS. --- Source/Core/VideoCommon/TextureCacheBase.cpp | 9 +++++---- Source/Core/VideoCommon/VertexManagerBase.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 07b6609282..afc5fd151f 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -483,7 +483,7 @@ public: void AddLevel(u32 width, u32 height, u32 row_length, const u8* buffer) { - levels.push_back({width, height, row_length, buffer}); + levels.push_back({{width, height, row_length}, buffer}); } bool HasArbitraryMipmaps(u8* downsample_buffer) const @@ -553,7 +553,7 @@ private: static PixelRGBAf Sample(const u8* src, const Shape& src_shape, u32 x, u32 y) { const auto* p = src + (x + y * src_shape.row_length) * 4; - return {SRGBToLinear(p[0]), SRGBToLinear(p[1]), SRGBToLinear(p[2]), SRGBToLinear(p[3])}; + return {{SRGBToLinear(p[0]), SRGBToLinear(p[1]), SRGBToLinear(p[2]), SRGBToLinear(p[3])}}; } // Puts a downsampled image in dst. dst must be at least width*height*4 @@ -565,9 +565,10 @@ private: { auto x = j * 2; auto y = i * 2; - const std::array samples = { + const std::array samples{{ Sample(src, src_shape, x, y), Sample(src, src_shape, x + 1, y), - Sample(src, src_shape, x, y + 1), Sample(src, src_shape, x + 1, y + 1)}; + Sample(src, src_shape, x, y + 1), Sample(src, src_shape, x + 1, y + 1), + }}; auto* dst_pixel = dst + (j + i * dst_shape.row_length) * 4; dst_pixel[0] = diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index f06eb9b31a..97f508fca4 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -35,7 +35,7 @@ std::unique_ptr g_vertex_manager; // GX primitive -> RenderState primitive, no primitive restart -constexpr std::array primitive_from_gx = { +constexpr std::array primitive_from_gx{{ PrimitiveType::Triangles, // GX_DRAW_QUADS PrimitiveType::Triangles, // GX_DRAW_QUADS_2 PrimitiveType::Triangles, // GX_DRAW_TRIANGLES @@ -44,10 +44,10 @@ constexpr std::array primitive_from_gx = { PrimitiveType::Lines, // GX_DRAW_LINES PrimitiveType::Lines, // GX_DRAW_LINE_STRIP PrimitiveType::Points, // GX_DRAW_POINTS -}; +}}; // GX primitive -> RenderState primitive, using primitive restart -constexpr std::array primitive_from_gx_pr = { +constexpr std::array primitive_from_gx_pr{{ PrimitiveType::TriangleStrip, // GX_DRAW_QUADS PrimitiveType::TriangleStrip, // GX_DRAW_QUADS_2 PrimitiveType::TriangleStrip, // GX_DRAW_TRIANGLES @@ -56,7 +56,7 @@ constexpr std::array primitive_from_gx_pr = { PrimitiveType::Lines, // GX_DRAW_LINES PrimitiveType::Lines, // GX_DRAW_LINE_STRIP PrimitiveType::Points, // GX_DRAW_POINTS -}; +}}; // Due to the BT.601 standard which the GameCube is based on being a compromise // between PAL and NTSC, neither standard gets square pixels. They are each off