From 50ea0843852004fa0d11a86c1097bf3844c906d5 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Mon, 24 Jun 2019 13:22:57 +0200 Subject: [PATCH] Update SPIRV-Cross. --- Makefile.common | 2 ++ gfx/drivers_shader/slang_reflection.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index b3da454d30..3b5f26f78d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1492,6 +1492,8 @@ ifeq ($(HAVE_SPIRV_CROSS), 1) 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_parser.o + OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cross_parsed_ir.o endif ifeq ($(WANT_WGL), 1) diff --git a/gfx/drivers_shader/slang_reflection.cpp b/gfx/drivers_shader/slang_reflection.cpp index 9cfc5497ef..e508db9e45 100644 --- a/gfx/drivers_shader/slang_reflection.cpp +++ b/gfx/drivers_shader/slang_reflection.cpp @@ -330,8 +330,7 @@ static bool add_active_buffer_ranges( { unsigned i; /* Get which uniforms are actually in use by this shader. */ - std::vector ranges = - compiler.get_active_buffer_ranges(resource.id); + auto ranges = compiler.get_active_buffer_ranges(resource.id); for (i = 0; i < ranges.size(); i++) {