Update SPIRV-Cross.

This commit is contained in:
Hans-Kristian Arntzen 2019-06-24 13:22:57 +02:00
parent 90fd5657b5
commit 50ea084385
2 changed files with 3 additions and 2 deletions

View File

@ -1492,6 +1492,8 @@ ifeq ($(HAVE_SPIRV_CROSS), 1)
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_glsl.o OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_glsl.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_hlsl.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
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_parser.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cross_parsed_ir.o
endif endif
ifeq ($(WANT_WGL), 1) ifeq ($(WANT_WGL), 1)

View File

@ -330,8 +330,7 @@ static bool add_active_buffer_ranges(
{ {
unsigned i; unsigned i;
/* Get which uniforms are actually in use by this shader. */ /* Get which uniforms are actually in use by this shader. */
std::vector<spirv_cross::BufferRange> ranges = auto ranges = compiler.get_active_buffer_ranges(resource.id);
compiler.get_active_buffer_ranges(resource.id);
for (i = 0; i < ranges.size(); i++) for (i = 0; i < ranges.size(); i++)
{ {