mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bake in spirv_msl as well - just use UINT32_MAX - max() numeric_limits

Browse Source 
was conflicting with Windows min/max macros
This commit is contained in:
twinaphex 2018-02-04 15:56:50 +01:00
parent 8771171f63
commit 2e8569a472
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -1361,7 +1361,7 @@ ifeq ($(HAVE_SPIRV_CROSS), 1)
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cfg.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_glsl.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_hlsl.o
#OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_msl.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_msl.o
endif
ifeq ($(WANT_WGL), 1)

2
deps/SPIRV-Cross/spirv_msl.hpp vendored
View File

@ -64,7 +64,7 @@ using MSLStructMemberKey = uint64_t;
// Special constant used in a MSLResourceBinding desc_set
// element to indicate the bindings for the push constants.
static const uint32_t kPushConstDescSet = std::numeric_limits<uint32_t>::max();
static const uint32_t kPushConstDescSet = UINT32_MAX;
// Special constant used in a MSLResourceBinding binding
// element to indicate the bindings for the push constants.

2
griffin/griffin_cpp.cpp
View File

@ -61,9 +61,7 @@ VIDEO DRIVER
#include "../deps/SPIRV-Cross/spirv_cfg.cpp"
#include "../deps/SPIRV-Cross/spirv_glsl.cpp"
#include "../deps/SPIRV-Cross/spirv_hlsl.cpp"
#if 0
#include "../deps/SPIRV-Cross/spirv_msl.cpp"
#endif
#ifdef HAVE_SLANG
#include "../gfx/drivers_shader/glslang_util.cpp"
#include "../gfx/drivers_shader/slang_preprocess.cpp"