summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2016-03-17 05:55:55 +0100
committerLioncash <mathew1800@gmail.com>2016-03-17 06:00:30 +0100
commit4d89df8df22c24748f7435ce8a94ec861f1bff0d (patch)
tree8fa161e66e166bc2327727481a9f63dd0d1d4a67
parentMerge pull request #1537 from lioncash/const (diff)
downloadyuzu-4d89df8df22c24748f7435ce8a94ec861f1bff0d.tar
yuzu-4d89df8df22c24748f7435ce8a94ec861f1bff0d.tar.gz
yuzu-4d89df8df22c24748f7435ce8a94ec861f1bff0d.tar.bz2
yuzu-4d89df8df22c24748f7435ce8a94ec861f1bff0d.tar.lz
yuzu-4d89df8df22c24748f7435ce8a94ec861f1bff0d.tar.xz
yuzu-4d89df8df22c24748f7435ce8a94ec861f1bff0d.tar.zst
yuzu-4d89df8df22c24748f7435ce8a94ec861f1bff0d.zip
-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 295a2466b..2dc8d5d5e 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include <common/file_util.h>
-
+#include <numeric>
#include <nihstro/shader_bytecode.h>
+#include "common/file_util.h"
#include "video_core/pica.h"
#include "video_core/pica_state.h"
#include "video_core/shader/shader.h"
@@ -214,10 +214,8 @@ void RunInterpreter(UnitState<Debug>& state) {
if (opcode == OpCode::Id::DPH || opcode == OpCode::Id::DPHI)
src1[3] = float24::FromFloat32(1.0f);
- float24 dot = float24::FromFloat32(0.f);
int num_components = (opcode == OpCode::Id::DP3) ? 3 : 4;
- for (int i = 0; i < num_components; ++i)
- dot = dot + src1[i] * src2[i];
+ float24 dot = std::inner_product(src1, src1 + num_components, src2, float24::FromFloat32(0.f));
for (int i = 0; i < 4; ++i) {
if (!swizzle.DestComponentEnabled(i))