ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6203 from lioncash/missing-braces-warn 

VideoCommon: Resolve -Wmissing-brace warnings
This commit is contained in:
JosJuice 2017-11-19 08:45:13 +01:00 committed by GitHub
parent 2385a03c2b 518f6a3624
commit 2ead31c769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -483,7 +483,7 @@ public:
void AddLevel(u32 width, u32 height, u32 row_length, const u8* buffer) 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 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) 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; 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 // Puts a downsampled image in dst. dst must be at least width*height*4
@ -565,9 +565,10 @@ private:
{ {
auto x = j * 2; auto x = j * 2;
auto y = i * 2; auto y = i * 2;
const std::array<PixelRGBAf, 4> samples = { const std::array<PixelRGBAf, 4> samples{{
Sample(src, src_shape, x, y), Sample(src, src_shape, x + 1, y), 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; auto* dst_pixel = dst + (j + i * dst_shape.row_length) * 4;
dst_pixel[0] = dst_pixel[0] =

8
Source/Core/VideoCommon/VertexManagerBase.cpp
View File

@ -35,7 +35,7 @@
std::unique_ptr<VertexManagerBase> g_vertex_manager; std::unique_ptr<VertexManagerBase> g_vertex_manager;
// GX primitive -> RenderState primitive, no primitive restart // GX primitive -> RenderState primitive, no primitive restart
constexpr std::array<PrimitiveType, 8> primitive_from_gx = { constexpr std::array<PrimitiveType, 8> primitive_from_gx{{
PrimitiveType::Triangles, // GX_DRAW_QUADS PrimitiveType::Triangles, // GX_DRAW_QUADS
PrimitiveType::Triangles, // GX_DRAW_QUADS_2 PrimitiveType::Triangles, // GX_DRAW_QUADS_2
PrimitiveType::Triangles, // GX_DRAW_TRIANGLES PrimitiveType::Triangles, // GX_DRAW_TRIANGLES
@ -44,10 +44,10 @@ constexpr std::array<PrimitiveType, 8> primitive_from_gx = {
PrimitiveType::Lines, // GX_DRAW_LINES PrimitiveType::Lines, // GX_DRAW_LINES
PrimitiveType::Lines, // GX_DRAW_LINE_STRIP PrimitiveType::Lines, // GX_DRAW_LINE_STRIP
PrimitiveType::Points, // GX_DRAW_POINTS PrimitiveType::Points, // GX_DRAW_POINTS
}; }};
// GX primitive -> RenderState primitive, using primitive restart // GX primitive -> RenderState primitive, using primitive restart
constexpr std::array<PrimitiveType, 8> primitive_from_gx_pr = { constexpr std::array<PrimitiveType, 8> primitive_from_gx_pr{{
PrimitiveType::TriangleStrip, // GX_DRAW_QUADS PrimitiveType::TriangleStrip, // GX_DRAW_QUADS
PrimitiveType::TriangleStrip, // GX_DRAW_QUADS_2 PrimitiveType::TriangleStrip, // GX_DRAW_QUADS_2
PrimitiveType::TriangleStrip, // GX_DRAW_TRIANGLES PrimitiveType::TriangleStrip, // GX_DRAW_TRIANGLES
@ -56,7 +56,7 @@ constexpr std::array<PrimitiveType, 8> primitive_from_gx_pr = {
PrimitiveType::Lines, // GX_DRAW_LINES PrimitiveType::Lines, // GX_DRAW_LINES
PrimitiveType::Lines, // GX_DRAW_LINE_STRIP PrimitiveType::Lines, // GX_DRAW_LINE_STRIP
PrimitiveType::Points, // GX_DRAW_POINTS PrimitiveType::Points, // GX_DRAW_POINTS
}; }};
// Due to the BT.601 standard which the GameCube is based on being a compromise // 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 // between PAL and NTSC, neither standard gets square pixels. They are each off