summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2016-03-20 00:35:06 -0400
committerGravatar bunnei2016-03-20 00:35:06 -0400
commit784c5539eaadb69c36363c89008e3a37ab9e9ae7 (patch)
treec084be223588127266f1b9c3c9f9c44a10795eeb /src
parentMerge pull request #1522 from MerryMage/dylibbundler (diff)
parentshader_interpreter: use std::inner_product for the dot product (diff)
downloadyuzu-784c5539eaadb69c36363c89008e3a37ab9e9ae7.tar.gz
yuzu-784c5539eaadb69c36363c89008e3a37ab9e9ae7.tar.xz
yuzu-784c5539eaadb69c36363c89008e3a37ab9e9ae7.zip
Merge pull request #1538 from lioncash/dot
shader_interpreter: use std::inner_product for the dot product
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/shader_interpreter.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
index 02e1a1cb1..9b978583e 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -2,10 +2,10 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <common/file_util.h> 5#include <numeric>
6
7#include <nihstro/shader_bytecode.h> 6#include <nihstro/shader_bytecode.h>
8 7
8#include "common/file_util.h"
9#include "video_core/pica.h" 9#include "video_core/pica.h"
10#include "video_core/pica_state.h" 10#include "video_core/pica_state.h"
11#include "video_core/shader/shader.h" 11#include "video_core/shader/shader.h"
@@ -214,10 +214,8 @@ void RunInterpreter(UnitState<Debug>& state) {
214 if (opcode == OpCode::Id::DPH || opcode == OpCode::Id::DPHI) 214 if (opcode == OpCode::Id::DPH || opcode == OpCode::Id::DPHI)
215 src1[3] = float24::FromFloat32(1.0f); 215 src1[3] = float24::FromFloat32(1.0f);
216 216
217 float24 dot = float24::FromFloat32(0.f);
218 int num_components = (opcode == OpCode::Id::DP3) ? 3 : 4; 217 int num_components = (opcode == OpCode::Id::DP3) ? 3 : 4;
219 for (int i = 0; i < num_components; ++i) 218 float24 dot = std::inner_product(src1, src1 + num_components, src2, float24::FromFloat32(0.f));
220 dot = dot + src1[i] * src2[i];
221 219
222 for (int i = 0; i < 4; ++i) { 220 for (int i = 0; i < 4; ++i) {
223 if (!swizzle.DestComponentEnabled(i)) 221 if (!swizzle.DestComponentEnabled(i))