Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages 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"] [submodule "deps/glslang/glslang"]
path = deps/glslang/glslang path = deps/glslang/glslang
url = git://github.com/KhronosGroup/glslang.git url = git://github.com/KhronosGroup/glslang.git
[submodule "deps/spir2cross"] [submodule "deps/SPIRV-Cross"]
path = deps/spir2cross path = deps/SPIRV-Cross
url = git://github.com/ARM-software/spir2cross 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/MachineIndependent/preprocessor/*.cpp) \
$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.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 += \ DEFINES += \
-Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \ -Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
@ -761,13 +761,13 @@ ifeq ($(HAVE_VULKAN), 1)
-Ideps/glslang/glslang/glslang/Public \ -Ideps/glslang/glslang/glslang/Public \
-Ideps/glslang/glslang/SPIRV \ -Ideps/glslang/glslang/SPIRV \
-Ideps/glslang \ -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 CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -I./gfx/include/vulkan
CFLAGS += -I./gfx/include/vulkan CFLAGS += -I./gfx/include/vulkan
GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o) 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 \ OBJ += gfx/drivers/vulkan.o \
gfx/common/vulkan_common.o \ gfx/common/vulkan_common.o \
@ -776,7 +776,7 @@ ifeq ($(HAVE_VULKAN), 1)
gfx/drivers_shader/glslang_util.o \ gfx/drivers_shader/glslang_util.o \
gfx/drivers_shader/slang_reflection.o \ gfx/drivers_shader/slang_reflection.o \
$(GLSLANG_OBJ) \ $(GLSLANG_OBJ) \
$(SPIR2CROSS_OBJ) $(SPIRV_CROSS_OBJ)
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_vulkan.o OBJ += menu/drivers_display/menu_display_vulkan.o
endif 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/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "spir2cross.hpp" #include "spirv_cross.hpp"
#include "slang_reflection.hpp" #include "slang_reflection.hpp"
#include <vector> #include <vector>
#include <stdio.h> #include <stdio.h>
#include "../../verbosity.h" #include "../../verbosity.h"
using namespace std; using namespace std;
using namespace spir2cross; using namespace spirv_cross;
static bool slang_texture_semantic_is_array(slang_texture_semantic sem) static bool slang_texture_semantic_is_array(slang_texture_semantic sem)
{ {