piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

ShaderGenCommon: Remove unnecessary static keywords

Browse Source 
Functions defined in a header should be inline only, otherwise program
code is generated for every other file that calls said functions
This commit is contained in:
Lioncash
2015-12-26 18:02:46 -05:00
parent c151fe582f
commit c5f123a70b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/ShaderGenCommon.h
View File

@ -220,7 +220,7 @@ private:
}; };
template<class T> template<class T>
static void DefineOutputMember(T& object, API_TYPE api_type, const char* qualifier, const char* type, const char* name, int var_index, const char* semantic = "", int semantic_index = -1) inline void DefineOutputMember(T& object, API_TYPE api_type, const char* qualifier, const char* type, const char* name, int var_index, const char* semantic = "", int semantic_index = -1)
{ {
if (qualifier != nullptr) if (qualifier != nullptr)
object.Write("\t%s %s %s", qualifier, type, name); object.Write("\t%s %s %s", qualifier, type, name);
@ -242,7 +242,7 @@ static void DefineOutputMember(T& object, API_TYPE api_type, const char* qualifi
} }
template<class T> template<class T>
static inline void GenerateVSOutputMembers(T& object, API_TYPE api_type, const char* qualifier = nullptr) inline void GenerateVSOutputMembers(T& object, API_TYPE api_type, const char* qualifier = nullptr)
{ {
DefineOutputMember(object, api_type, qualifier, "float4", "pos", -1, "POSITION"); DefineOutputMember(object, api_type, qualifier, "float4", "pos", -1, "POSITION");
DefineOutputMember(object, api_type, qualifier, "float4", "colors_", 0, "COLOR", 0); DefineOutputMember(object, api_type, qualifier, "float4", "colors_", 0, "COLOR", 0);
@ -261,7 +261,7 @@ static inline void GenerateVSOutputMembers(T& object, API_TYPE api_type, const c
} }
template<class T> template<class T>
static inline void AssignVSOutputMembers(T& object, const char* a, const char* b) inline void AssignVSOutputMembers(T& object, const char* a, const char* b)
{ {
object.Write("\t%s.pos = %s.pos;\n", a, b); object.Write("\t%s.pos = %s.pos;\n", a, b);
object.Write("\t%s.colors_0 = %s.colors_0;\n", a, b); object.Write("\t%s.colors_0 = %s.colors_0;\n", a, b);
@ -287,7 +287,7 @@ static inline void AssignVSOutputMembers(T& object, const char* a, const char* b
// As a workaround, we interpolate at the centroid of the coveraged pixel, which // As a workaround, we interpolate at the centroid of the coveraged pixel, which
// is always inside the primitive. // is always inside the primitive.
// Without MSAA, this flag is defined to have no effect. // Without MSAA, this flag is defined to have no effect.
static inline const char* GetInterpolationQualifier(API_TYPE api_type, bool in = true, bool in_out = false) inline const char* GetInterpolationQualifier(API_TYPE api_type, bool in = true, bool in_out = false)
{ {
if (g_ActiveConfig.iMultisamples <= 1) if (g_ActiveConfig.iMultisamples <= 1)
return ""; return "";