summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-09-16 14:38:12 +0200
committerLioncash <mathew1800@gmail.com>2015-09-16 14:51:53 +0200
commit751fbfdcc33420cb39aee30158706984efb4da40 (patch)
tree570330019bba030c78af7d7715b89a5b3de7ccc6 /src/video_core
parentMerge pull request #1097 from yuriks/cfg-blocks (diff)
downloadyuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.gz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.bz2
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.lz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.xz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.zst
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp6
-rw-r--r--src/video_core/rasterizer.cpp4
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 77a4fe272..aa1f1484c 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -92,7 +92,7 @@ void GeometryDumper::AddTriangle(Vertex& v0, Vertex& v1, Vertex& v2) {
vertices.push_back(v2);
int num_vertices = (int)vertices.size();
- faces.push_back({ num_vertices-3, num_vertices-2, num_vertices-1 });
+ faces.push_back({{ num_vertices-3, num_vertices-2, num_vertices-1 }});
}
void GeometryDumper::Dump() {
@@ -576,8 +576,8 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture
unsigned table_index = static_cast<int>((x < 2) ? table_index_1.Value() : table_index_2.Value());
static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{
- { 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 },
- { 18, 60 }, { 24, 80 }, { 33, 106 }, { 47, 183 }
+ {{ 2, 8 }}, {{ 5, 17 }}, {{ 9, 29 }}, {{ 13, 42 }},
+ {{ 18, 60 }}, {{ 24, 80 }}, {{ 33, 106 }}, {{ 47, 183 }}
}};
int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel));
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index a90ff5fef..6e2266b1c 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -735,11 +735,11 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
auto color_output = ColorCombine(tev_stage.color_op, color_result);
// alpha combiner
- std::array<u8,3> alpha_result = {
+ std::array<u8,3> alpha_result = {{
GetAlphaModifier(tev_stage.alpha_modifier1, GetSource(tev_stage.alpha_source1)),
GetAlphaModifier(tev_stage.alpha_modifier2, GetSource(tev_stage.alpha_source2)),
GetAlphaModifier(tev_stage.alpha_modifier3, GetSource(tev_stage.alpha_source3))
- };
+ }};
auto alpha_output = AlphaCombine(tev_stage.alpha_op, alpha_result);
combiner_output[0] = std::min((unsigned)255, color_output.r() * tev_stage.GetColorMultiplier());
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 22f261c68..f1313b54f 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -314,12 +314,12 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,
* Draws a single texture to the emulator window, rotating the texture to correct for the 3DS's LCD rotation.
*/
void RendererOpenGL::DrawSingleScreenRotated(const TextureInfo& texture, float x, float y, float w, float h) {
- std::array<ScreenRectVertex, 4> vertices = {
+ std::array<ScreenRectVertex, 4> vertices = {{
ScreenRectVertex(x, y, 1.f, 0.f),
ScreenRectVertex(x+w, y, 1.f, 1.f),
ScreenRectVertex(x, y+h, 0.f, 0.f),
ScreenRectVertex(x+w, y+h, 0.f, 1.f),
- };
+ }};
state.texture_units[0].texture_2d = texture.handle;
state.Apply();