summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-03-22 16:59:12 +0100
committerbunnei <bunneidev@gmail.com>2016-03-22 16:59:12 +0100
commitebbba0d3812dc978cfe2d39cfcd13648178efb82 (patch)
tree85c7ddc1d72469b05909c647cf0a7d9ecab14ec3 /src/video_core/shader
parentMerge pull request #1560 from lioncash/savedata (diff)
parentRespect vs output map (diff)
downloadyuzu-ebbba0d3812dc978cfe2d39cfcd13648178efb82.tar
yuzu-ebbba0d3812dc978cfe2d39cfcd13648178efb82.tar.gz
yuzu-ebbba0d3812dc978cfe2d39cfcd13648178efb82.tar.bz2
yuzu-ebbba0d3812dc978cfe2d39cfcd13648178efb82.tar.lz
yuzu-ebbba0d3812dc978cfe2d39cfcd13648178efb82.tar.xz
yuzu-ebbba0d3812dc978cfe2d39cfcd13648178efb82.tar.zst
yuzu-ebbba0d3812dc978cfe2d39cfcd13648178efb82.zip
Diffstat (limited to 'src/video_core/shader')
-rw-r--r--src/video_core/shader/shader.cpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index 509558fc0..eb1db0778 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -121,15 +121,23 @@ OutputVertex Run(UnitState<false>& state, const InputVertex& input, int num_attr
OutputVertex ret;
// TODO(neobrain): Under some circumstances, up to 16 attributes may be output. We need to
// figure out what those circumstances are and enable the remaining outputs then.
- for (int i = 0; i < 7; ++i) {
- const auto& output_register_map = g_state.regs.vs_output_attributes[i]; // TODO: Don't hardcode VS here
+ unsigned index = 0;
+ for (unsigned i = 0; i < 7; ++i) {
+
+ if (index >= g_state.regs.vs_output_total)
+ break;
+
+ if ((g_state.regs.vs.output_mask & (1 << i)) == 0)
+ continue;
+
+ const auto& output_register_map = g_state.regs.vs_output_attributes[index]; // TODO: Don't hardcode VS here
u32 semantics[4] = {
output_register_map.map_x, output_register_map.map_y,
output_register_map.map_z, output_register_map.map_w
};
- for (int comp = 0; comp < 4; ++comp) {
+ for (unsigned comp = 0; comp < 4; ++comp) {
float24* out = ((float24*)&ret) + semantics[comp];
if (semantics[comp] != Regs::VSOutputAttributes::INVALID) {
*out = state.registers.output[i][comp];
@@ -139,10 +147,12 @@ OutputVertex Run(UnitState<false>& state, const InputVertex& input, int num_attr
memset(out, 0, sizeof(*out));
}
}
+
+ index++;
}
// The hardware takes the absolute and saturates vertex colors like this, *before* doing interpolation
- for (int i = 0; i < 4; ++i) {
+ for (unsigned i = 0; i < 4; ++i) {
ret.color[i] = float24::FromFloat32(
std::fmin(std::fabs(ret.color[i].ToFloat32()), 1.0f));
}