diff options
| author | 2018-07-21 18:50:14 -0700 | |
|---|---|---|
| committer | 2018-07-21 18:50:14 -0700 | |
| commit | 3ac736c0031672fc16d04b3e3c69ba5dffe75047 (patch) | |
| tree | 4dba6e9fbaded97082ff2228110d7bda91428593 /src/video_core/textures/decoders.cpp | |
| parent | Merge pull request #758 from lioncash/sync (diff) | |
| parent | video_core: Use nested namespaces where applicable (diff) | |
| download | yuzu-3ac736c0031672fc16d04b3e3c69ba5dffe75047.tar.gz yuzu-3ac736c0031672fc16d04b3e3c69ba5dffe75047.tar.xz yuzu-3ac736c0031672fc16d04b3e3c69ba5dffe75047.zip | |
Merge pull request #748 from lioncash/namespace
video_core: Use nested namespaces where applicable
Diffstat (limited to 'src/video_core/textures/decoders.cpp')
| -rw-r--r-- | src/video_core/textures/decoders.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp index a3684a195..a3e67d105 100644 --- a/src/video_core/textures/decoders.cpp +++ b/src/video_core/textures/decoders.cpp | |||
| @@ -10,8 +10,7 @@ | |||
| 10 | #include "video_core/textures/decoders.h" | 10 | #include "video_core/textures/decoders.h" |
| 11 | #include "video_core/textures/texture.h" | 11 | #include "video_core/textures/texture.h" |
| 12 | 12 | ||
| 13 | namespace Tegra { | 13 | namespace Tegra::Texture { |
| 14 | namespace Texture { | ||
| 15 | 14 | ||
| 16 | /** | 15 | /** |
| 17 | * Calculates the offset of an (x, y) position within a swizzled texture. | 16 | * Calculates the offset of an (x, y) position within a swizzled texture. |
| @@ -186,5 +185,4 @@ std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat | |||
| 186 | return rgba_data; | 185 | return rgba_data; |
| 187 | } | 186 | } |
| 188 | 187 | ||
| 189 | } // namespace Texture | 188 | } // namespace Tegra::Texture |
| 190 | } // namespace Tegra | ||