diff options
author | wwylele <wwylele@gmail.com> | 2017-06-01 15:56:46 +0200 |
---|---|---|
committer | wwylele <wwylele@gmail.com> | 2017-06-04 08:47:25 +0200 |
commit | 28d1e73d2f1eb5d77568303050d254fd3b4df853 (patch) | |
tree | 29f34273ed1a7943a5f32b6e510d6f4caf6e5c02 /src/video_core/swrasterizer/texturing.cpp | |
parent | Merge pull request #2734 from yuriks/cmake-imported-libs (diff) | |
download | yuzu-28d1e73d2f1eb5d77568303050d254fd3b4df853.tar yuzu-28d1e73d2f1eb5d77568303050d254fd3b4df853.tar.gz yuzu-28d1e73d2f1eb5d77568303050d254fd3b4df853.tar.bz2 yuzu-28d1e73d2f1eb5d77568303050d254fd3b4df853.tar.lz yuzu-28d1e73d2f1eb5d77568303050d254fd3b4df853.tar.xz yuzu-28d1e73d2f1eb5d77568303050d254fd3b4df853.tar.zst yuzu-28d1e73d2f1eb5d77568303050d254fd3b4df853.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/swrasterizer/texturing.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/video_core/swrasterizer/texturing.cpp b/src/video_core/swrasterizer/texturing.cpp index aeb6aeb8c..4f02b93f2 100644 --- a/src/video_core/swrasterizer/texturing.cpp +++ b/src/video_core/swrasterizer/texturing.cpp @@ -18,22 +18,33 @@ using TevStageConfig = TexturingRegs::TevStageConfig; int GetWrappedTexCoord(TexturingRegs::TextureConfig::WrapMode mode, int val, unsigned size) { switch (mode) { + case TexturingRegs::TextureConfig::ClampToEdge2: + // For negative coordinate, ClampToEdge2 behaves the same as Repeat + if (val < 0) { + return static_cast<int>(static_cast<unsigned>(val) % size); + } + // [[fallthrough]] case TexturingRegs::TextureConfig::ClampToEdge: val = std::max(val, 0); - val = std::min(val, (int)size - 1); + val = std::min(val, static_cast<int>(size) - 1); return val; case TexturingRegs::TextureConfig::ClampToBorder: return val; + case TexturingRegs::TextureConfig::ClampToBorder2: + // For ClampToBorder2, the case of positive coordinate beyond the texture size is already + // handled outside. Here we only handle the negative coordinate in the same way as Repeat. + case TexturingRegs::TextureConfig::Repeat2: + case TexturingRegs::TextureConfig::Repeat3: case TexturingRegs::TextureConfig::Repeat: - return (int)((unsigned)val % size); + return static_cast<int>(static_cast<unsigned>(val) % size); case TexturingRegs::TextureConfig::MirroredRepeat: { - unsigned int coord = ((unsigned)val % (2 * size)); + unsigned int coord = (static_cast<unsigned>(val) % (2 * size)); if (coord >= size) coord = 2 * size - 1 - coord; - return (int)coord; + return static_cast<int>(coord); } default: |