mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 07:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Move to SPIRV-Cross.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2016-05-08 12:43:58 +02:00
parent 951c3e4085
commit ade5131833
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "deps/glslang/glslang"]
path = deps/glslang/glslang
url = git://github.com/KhronosGroup/glslang.git
[submodule "deps/spir2cross"]
path = deps/spir2cross
url = git://github.com/ARM-software/spir2cross
[submodule "deps/SPIRV-Cross"]
path = deps/SPIRV-Cross
url = git://github.com/KhronosGroup/SPIRV-Cross

8
Makefile.common
View File

@ -752,7 +752,7 @@ ifeq ($(HAVE_VULKAN), 1)
$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
SPIR2CROSS_SOURCES := deps/spir2cross/spir2cross.cpp
SPIRV_CROSS_SOURCES := deps/SPIRV-Cross/spirv_cross.cpp
DEFINES += \
-Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
@ -761,13 +761,13 @@ ifeq ($(HAVE_VULKAN), 1)
-Ideps/glslang/glslang/glslang/Public \
-Ideps/glslang/glslang/SPIRV \
-Ideps/glslang \
-Ideps/spir2cross
-Ideps/SPIRV-Cross
CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -I./gfx/include/vulkan
CFLAGS += -I./gfx/include/vulkan
GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)
SPIR2CROSS_OBJ := $(SPIR2CROSS_SOURCES:.cpp=.o)
SPIRV_CROSS_OBJ := $(SPIRV_CROSS_SOURCES:.cpp=.o)
OBJ += gfx/drivers/vulkan.o \
gfx/common/vulkan_common.o \
@ -776,7 +776,7 @@ ifeq ($(HAVE_VULKAN), 1)
gfx/drivers_shader/glslang_util.o \
gfx/drivers_shader/slang_reflection.o \
$(GLSLANG_OBJ) \
$(SPIR2CROSS_OBJ)
$(SPIRV_CROSS_OBJ)
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_vulkan.o
endif

1
deps/SPIRV-Cross vendored Submodule

@ -0,0 +1 @@
Subproject commit 44ef367141f9935bc719c9cc25693a9055f61efa

4
gfx/drivers_shader/slang_reflection.cpp
View File

@ -13,14 +13,14 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "spir2cross.hpp"
#include "spirv_cross.hpp"
#include "slang_reflection.hpp"
#include <vector>
#include <stdio.h>
#include "../../verbosity.h"
using namespace std;
using namespace spir2cross;
using namespace spirv_cross;
static bool slang_texture_semantic_is_array(slang_texture_semantic sem)
{