From e1ef9fe5694fe400d985cf71ae75291195433127 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Dec 2015 18:16:08 -0500 Subject: [PATCH] video_core/utils: Remove static from header functions --- src/video_core/utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/utils.h b/src/video_core/utils.h index 4fa60a10e..d64a93ae7 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h @@ -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: * 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 i = (i ^ (i << 2)) & 0x1313; // ---2 --10 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 */ -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 // 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.