mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glslang portability: Resolve OSX errors, some other OS warnings.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31468 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2015-06-10 22:05:48 +00:00
parent 3ef22f2139
commit 79eaa91e6f
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SPIRV/SPVRemapper.h
View File

@@ -38,6 +38,7 @@
#include <string>
#include <vector>
#include <stdlib.h>
namespace spv {
@@ -112,7 +113,7 @@ public:
spirvbin_t(int verbose = 0) : entryPoint(spv::NoResult), largestNewId(0), verbose(verbose) { }
// remap on an existing binary in memory
void remap(std::vector<std::uint32_t>& spv, std::uint32_t opts = Options::DO_EVERYTHING);
void remap(std::vector<std::uint32_t>& spv, std::uint32_t opts = DO_EVERYTHING);
// Type for error/log handler functions
typedef std::function<void(const std::string&)> errorfn_t;
@@ -131,7 +132,7 @@ private:
typedef std::unordered_map<spv::Id, spv::Id> idmap_t;
typedef std::unordered_set<spv::Id> idset_t;
void remap(std::uint32_t opts = Options::DO_EVERYTHING);
void remap(std::uint32_t opts = DO_EVERYTHING);
// Map of names to IDs
typedef std::unordered_map<std::string, spv::Id> namemap_t;