summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2020-04-15 09:14:28 +0200
committerGitHub <noreply@github.com>2020-04-15 09:14:28 +0200
commit13331a3a321719a52fe6f70936c073f92edcb8db (patch)
treeb4cc254b859890e95e5512a56251f0250ea05457 /src
parentMerge pull request #3667 from ReinUsesLisp/viewport-trash (diff)
parentRevert "gl_shader_decompiler: Implement merges with bitfieldInsert" (diff)
downloadyuzu-13331a3a321719a52fe6f70936c073f92edcb8db.tar
yuzu-13331a3a321719a52fe6f70936c073f92edcb8db.tar.gz
yuzu-13331a3a321719a52fe6f70936c073f92edcb8db.tar.bz2
yuzu-13331a3a321719a52fe6f70936c073f92edcb8db.tar.lz
yuzu-13331a3a321719a52fe6f70936c073f92edcb8db.tar.xz
yuzu-13331a3a321719a52fe6f70936c073f92edcb8db.tar.zst
yuzu-13331a3a321719a52fe6f70936c073f92edcb8db.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 1f1f01313..59bbd1211 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -1821,13 +1821,15 @@ private:
Expression HMergeH0(Operation operation) {
const std::string dest = VisitOperand(operation, 0).AsUint();
const std::string src = VisitOperand(operation, 1).AsUint();
- return {fmt::format("bitfieldInsert({}, {}, 0, 16)", dest, src), Type::Uint};
+ return {fmt::format("vec2(unpackHalf2x16({}).x, unpackHalf2x16({}).y)", src, dest),
+ Type::HalfFloat};
}
Expression HMergeH1(Operation operation) {
const std::string dest = VisitOperand(operation, 0).AsUint();
const std::string src = VisitOperand(operation, 1).AsUint();
- return {fmt::format("bitfieldInsert({}, {}, 16, 16)", dest, src), Type::Uint};
+ return {fmt::format("vec2(unpackHalf2x16({}).x, unpackHalf2x16({}).y)", dest, src),
+ Type::HalfFloat};
}
Expression HPack2(Operation operation) {