AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-20 17:39:13 +00:00
Code Issues Projects Releases Wiki Activity

macOS build fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-10-15 17:15:05 -10:00
parent 61a50aa57e
commit d395f4a79e
12 changed files with 252 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hecl/lib/Backend/GLSL.cpp
View File

@@ -220,7 +220,7 @@ std::string GLSL::makeVert(unsigned col, unsigned uv, unsigned w,
return retval + "}\n";
}
std::string GLSL::makeFrag(bool alphaTest,
std::string GLSL::makeFrag(size_t blockCount, const char** blockNames, bool alphaTest,
ReflectionType reflectionType, const Function& lighting) const
{
std::string lightingSrc;
@@ -282,7 +282,8 @@ std::string GLSL::makeFrag(bool alphaTest,
return retval + (alphaTest ? GenerateAlphaTest() : "") + "}\n";
}
std::string GLSL::makeFrag(bool alphaTest,
std::string GLSL::makeFrag(size_t blockCount, const char** blockNames,
bool alphaTest,
ReflectionType reflectionType,
const Function& lighting,
const Function& post,

6
hecl/lib/Backend/HLSL.cpp
View File

@@ -214,7 +214,8 @@ std::string HLSL::makeVert(unsigned col, unsigned uv, unsigned w,
"}\n";
}
std::string HLSL::makeFrag(bool alphaTest, ReflectionType reflectionType,
std::string HLSL::makeFrag(size_t blockCount, const char** blockNames,
bool alphaTest, ReflectionType reflectionType,
const Function& lighting) const
{
std::string lightingSrc;
@@ -271,7 +272,8 @@ std::string HLSL::makeFrag(bool alphaTest, ReflectionType reflectionType,
return retval + (alphaTest ? GenerateAlphaTest() : "") + " return colorOut;\n}\n";
}
std::string HLSL::makeFrag(bool alphaTest, ReflectionType reflectionType,
std::string HLSL::makeFrag(size_t blockCount, const char** blockNames,
bool alphaTest, ReflectionType reflectionType,
const Function& lighting,
const Function& post, size_t extTexCount,
const TextureInfo* extTexs) const