summaryrefslogtreecommitdiff
path: root/src/video_core/textures
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/textures')
-rw-r--r--src/video_core/textures/decoders.cpp6
-rw-r--r--src/video_core/textures/decoders.h6
-rw-r--r--src/video_core/textures/texture.h6
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 @@
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
13namespace Tegra { 13namespace Tegra::Texture {
14namespace 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
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 @@
8#include "common/common_types.h" 8#include "common/common_types.h"
9#include "video_core/textures/texture.h" 9#include "video_core/textures/texture.h"
10 10
11namespace Tegra { 11namespace Tegra::Texture {
12namespace Texture {
13 12
14/** 13/**
15 * Unswizzles a swizzled texture without changing its format. 14 * 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_
33std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat format, u32 width, 32std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat format, u32 width,
34 u32 height); 33 u32 height);
35 34
36} // namespace Texture 35} // namespace Tegra::Texture
37} // namespace Tegra
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 @@
10#include "common/common_types.h" 10#include "common/common_types.h"
11#include "video_core/memory_manager.h" 11#include "video_core/memory_manager.h"
12 12
13namespace Tegra { 13namespace Tegra::Texture {
14namespace Texture {
15 14
16enum class TextureFormat : u32 { 15enum class TextureFormat : u32 {
17 R32_G32_B32_A32 = 0x01, 16 R32_G32_B32_A32 = 0x01,
@@ -260,5 +259,4 @@ struct FullTextureInfo {
260/// Returns the number of bytes per pixel of the input texture format. 259/// Returns the number of bytes per pixel of the input texture format.
261u32 BytesPerPixel(TextureFormat format); 260u32 BytesPerPixel(TextureFormat format);
262 261
263} // namespace Texture 262} // namespace Tegra::Texture
264} // namespace Tegra