video_core: use nested namespaces

This commit is contained in:
tgsm 2019-02-19 03:09:57 -05:00
parent f409342ab5
commit d6c530d08c
26 changed files with 52 additions and 120 deletions

View file

@ -10,8 +10,7 @@
#include "common/vector_math.h"
#include "video_core/texture/etc1.h"
namespace Pica {
namespace Texture {
namespace Pica::Texture {
namespace {
@ -125,5 +124,4 @@ Math::Vec3<u8> SampleETC1Subtile(u64 value, unsigned int x, unsigned int y) {
return tile.GetRGB(x, y);
}
} // namespace Texture
} // namespace Pica
} // namespace Pica::Texture

View file

@ -7,10 +7,8 @@
#include "common/common_types.h"
#include "common/vector_math.h"
namespace Pica {
namespace Texture {
namespace Pica::Texture {
Math::Vec3<u8> SampleETC1Subtile(u64 value, unsigned int x, unsigned int y);
} // namespace Texture
} // namespace Pica
} // namespace Pica::Texture

View file

@ -15,8 +15,7 @@
using TextureFormat = Pica::TexturingRegs::TextureFormat;
namespace Pica {
namespace Texture {
namespace Pica::Texture {
constexpr std::size_t TILE_SIZE = 8 * 8;
constexpr std::size_t ETC1_SUBTILES = 2 * 2;
@ -223,5 +222,4 @@ TextureInfo TextureInfo::FromPicaRegister(const TexturingRegs::TextureConfig& co
return info;
}
} // namespace Texture
} // namespace Pica
} // namespace Pica::Texture

View file

@ -8,8 +8,7 @@
#include "common/vector_math.h"
#include "video_core/regs_texturing.h"
namespace Pica {
namespace Texture {
namespace Pica::Texture {
/// Returns the byte size of a 8*8 tile of the specified texture format.
size_t CalculateTileSize(TexturingRegs::TextureFormat format);
@ -56,5 +55,4 @@ Math::Vec4<u8> LookupTexture(const u8* source, unsigned int x, unsigned int y,
Math::Vec4<u8> LookupTexelInTile(const u8* source, unsigned int x, unsigned int y,
const TextureInfo& info, bool disable_alpha);
} // namespace Texture
} // namespace Pica
} // namespace Pica::Texture