AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +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

6
hecl/shaderc/shaderc.cpp
View File

@@ -8,6 +8,8 @@
#include <unordered_map>
#include <set>
#include <bitset>
#include <memory>
#include <cstdint>
using namespace std::literals;
@@ -100,7 +102,7 @@ struct CompileStageAction
template<typename P, typename S>
static bool Do(const std::string& name, const std::string& basename, const std::string& stage, std::string& implOut)
{
std::pair<std::shared_ptr<uint8_t[]>, size_t> data = CompileShader<P, S>(stage);
std::pair<StageBinaryData, size_t> data = CompileShader<P, S>(stage);
if (data.second == 0)
return false;
@@ -109,7 +111,7 @@ struct CompileStageAction
{
implOut += " ";
for (int j = 0; j < 10 && i < data.second ; ++i, ++j)
implOut += Format("0x%02X, ", data.first[i]);
implOut += Format("0x%02X, ", data.first.get()[i]);
implOut += "\n";
}
implOut += "};\n\n";