ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge `FORCE_INLINE` macro to `alwaysinline` into port.h.

This commit is contained in:
Kenta Yoshimura 2019-04-08 01:07:16 +09:00
parent 9cec789d1b
commit c71429c2b7
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apu/bapu/snes/snes.hpp
View File

@ -5,17 +5,6 @@
#include "../../resampler.h" #include "../../resampler.h"
#include "../../../msu1.h" #include "../../../msu1.h"
#if defined(__GNUC__)
#define inline inline
#define alwaysinline inline __attribute__((always_inline))
#elif defined(_MSC_VER)
#define inline inline
#define alwaysinline inline __forceinline
#else
#define inline inline
#define alwaysinline inline
#endif
#define debugvirtual #define debugvirtual
namespace SNES namespace SNES

13
filter/xbrz.cpp
View File

@ -74,15 +74,6 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c
// //
#ifdef _MSC_VER
#define FORCE_INLINE __forceinline
#elif defined __GNUC__
#define FORCE_INLINE __attribute__((always_inline)) inline
#else
#define FORCE_INLINE inline
#endif
enum RotationDegree //clock-wise enum RotationDegree //clock-wise
{ {
ROT_0, ROT_0,
@ -268,7 +259,7 @@ input kernel area naming convention:
----------------- -----------------
*/ */
template <class ColorDistance> template <class ColorDistance>
FORCE_INLINE //detect blend direction alwaysinline //detect blend direction
BlendResult preProcessCorners(const Kernel_4x4& ker, const xbrz::ScalerCfg& cfg) //result: F, G, J, K corners of "GradientType" BlendResult preProcessCorners(const Kernel_4x4& ker, const xbrz::ScalerCfg& cfg) //result: F, G, J, K corners of "GradientType"
{ {
BlendResult result = {}; BlendResult result = {};
@ -378,7 +369,7 @@ input kernel area naming convention:
------------- -------------
*/ */
template <class Scaler, class ColorDistance, RotationDegree rotDeg> template <class Scaler, class ColorDistance, RotationDegree rotDeg>
FORCE_INLINE //perf: quite worth it! alwaysinline //perf: quite worth it!
void blendPixel(const Kernel_3x3& ker, void blendPixel(const Kernel_3x3& ker,
uint32_t* target, int trgWidth, uint32_t* target, int trgWidth,
unsigned char blendInfo, //result of preprocessing all four corners of pixel "e" unsigned char blendInfo, //result of preprocessing all four corners of pixel "e"

8
port.h
View File

@ -44,6 +44,14 @@
#define PIXEL_FORMAT RGB565 #define PIXEL_FORMAT RGB565
#endif #endif
#if defined(__GNUC__)
#define alwaysinline inline __attribute__((always_inline))
#elif defined(_MSC_VER)
#define alwaysinline __forceinline
#else
#define alwaysinline inline
#endif
#ifndef snes9x_types_defined #ifndef snes9x_types_defined
#define snes9x_types_defined #define snes9x_types_defined
typedef unsigned char bool8; typedef unsigned char bool8;