diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-07-20 18:14:17 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-07-20 18:23:54 -0400 |
| commit | bb960c8cb43a3250d971cd8bb4adc5dd0c5baccc (patch) | |
| tree | c7745ac491c15a6d4519548812a7105903410a18 /src/video_core/textures | |
| parent | c1c9ab31e80a182d03765658191bfd3a6c8a691f (diff) | |
video_core: Use nested namespaces where applicable
Compresses a few namespace specifiers to be more compact.
Diffstat (limited to 'src/video_core/textures')
| -rw-r--r-- | src/video_core/textures/decoders.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/textures/decoders.h | 6 | ||||
| -rw-r--r-- | src/video_core/textures/texture.h | 6 |
3 files changed, 6 insertions, 12 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 @@ #include "video_core/textures/decoders.h" #include "video_core/textures/texture.h" -namespace Tegra { -namespace Texture { +namespace Tegra::Texture { /** * 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 return rgba_data; } -} // namespace Texture -} // namespace Tegra +} // namespace Tegra::Texture diff --git a/src/video_core/textures/decoders.h b/src/video_core/textures/decoders.h index 2b088c077..73a4924d1 100644 --- a/src/video_core/textures/decoders.h +++ b/src/video_core/textures/decoders.h @@ -8,8 +8,7 @@ #include "common/common_types.h" #include "video_core/textures/texture.h" -namespace Tegra { -namespace Texture { +namespace Tegra::Texture { /** * Unswizzles a swizzled texture without changing its format. @@ -33,5 +32,4 @@ void CopySwizzledData(u32 width, u32 height, u32 bytes_per_pixel, u32 out_bytes_ std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat format, u32 width, u32 height); -} // namespace Texture -} // namespace Tegra +} // namespace Tegra::Texture diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h index a17eaf19d..d1c755033 100644 --- a/src/video_core/textures/texture.h +++ b/src/video_core/textures/texture.h @@ -10,8 +10,7 @@ #include "common/common_types.h" #include "video_core/memory_manager.h" -namespace Tegra { -namespace Texture { +namespace Tegra::Texture { enum class TextureFormat : u32 { R32_G32_B32_A32 = 0x01, @@ -260,5 +259,4 @@ struct FullTextureInfo { /// Returns the number of bytes per pixel of the input texture format. u32 BytesPerPixel(TextureFormat format); -} // namespace Texture -} // namespace Tegra +} // namespace Tegra::Texture |