OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 22:20:14 +00:00
Code Issues Projects Releases Wiki Activity

video_core/utils: Remove static from header functions

Browse Source
This commit is contained in:
Lioncash 2015-12-29 18:16:08 -05:00
parent 73740d74ed
commit e1ef9fe569
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/utils.h
View File

@ -40,7 +40,7 @@ void DumpTGA(std::string filename, short width, short height, u8* raw_data);
* arranged in a Z-order curve. More details on the bit manipulation at: * arranged in a Z-order curve. More details on the bit manipulation at:
* https://fgiesen.wordpress.com/2009/12/13/decoding-morton-codes/ * https://fgiesen.wordpress.com/2009/12/13/decoding-morton-codes/
*/ */
static inline u32 MortonInterleave(u32 x, u32 y) { inline u32 MortonInterleave(u32 x, u32 y) {
u32 i = (x & 7) | ((y & 7) << 8); // ---- -210 u32 i = (x & 7) | ((y & 7) << 8); // ---- -210
i = (i ^ (i << 2)) & 0x1313; // ---2 --10 i = (i ^ (i << 2)) & 0x1313; // ---2 --10
i = (i ^ (i << 1)) & 0x1515; // ---2 -1-0 i = (i ^ (i << 1)) & 0x1515; // ---2 -1-0
@ -51,7 +51,7 @@ static inline u32 MortonInterleave(u32 x, u32 y) {
/** /**
* Calculates the offset of the position of the pixel in Morton order * Calculates the offset of the position of the pixel in Morton order
*/ */
static inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) { inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) {
// Images are split into 8x8 tiles. Each tile is composed of four 4x4 subtiles each // Images are split into 8x8 tiles. Each tile is composed of four 4x4 subtiles each
// of which is composed of four 2x2 subtiles each of which is composed of four texels. // of which is composed of four 2x2 subtiles each of which is composed of four texels.
// Each structure is embedded into the next-bigger one in a diagonal pattern, e.g. // Each structure is embedded into the next-bigger one in a diagonal pattern, e.g.