Update glslang support for MSVC

This commit is contained in:
twinaphex 2017-12-30 04:36:35 +01:00
parent d49b7b28b6
commit a792112bd1
3 changed files with 10 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* RetroArch - A frontend for libretro. /* RetroArch - A frontend for libretro.
* Copyright (C) 2016 - Hans-Kristian Arntzen * Copyright (C) 2016 - Hans-Kristian Arntzen
* *
* RetroArch is free software: you can redistribute it and/or modify it under the terms * RetroArch is free software: you can redistribute it and/or modify it under the terms
@ -16,7 +16,7 @@
#include "glslang.hpp" #include "glslang.hpp"
#include "glslang/glslang/Public/ShaderLang.h" #include "glslang/glslang/Public/ShaderLang.h"
#include "GlslangToSpv.h" #include "glslang/SPIRV/GlslangToSpv.h"
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>

View File

@ -32,6 +32,9 @@
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE //ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE. //POSSIBILITY OF SUCH DAMAGE.
#ifndef _SPIRV_doc_h
#define _SPIRV_doc_h
// //
// Parameterize the SPIR-V enumerants. // Parameterize the SPIR-V enumerants.
// //
@ -258,3 +261,5 @@ const char* AccessQualifierString(int attr);
void PrintOperands(const OperandParameters& operands, int reservedOperands); void PrintOperands(const OperandParameters& operands, int reservedOperands);
}; // end namespace spv }; // end namespace spv
#endif

View File

@ -1,4 +1,4 @@
/* RetroArch - A frontend for libretro. /* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis * Copyright (C) 2011-2017 - Daniel De Matteis
* *
* RetroArch is free software: you can redistribute it and/or modify it under the terms * RetroArch is free software: you can redistribute it and/or modify it under the terms
@ -28,7 +28,9 @@
#ifdef WANT_GLSLANG #ifdef WANT_GLSLANG
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
#include "../deps/glslang/glslang.cpp" #include "../deps/glslang/glslang.cpp"
#if 0
#include "../deps/glslang/glslang_tab.cpp" #include "../deps/glslang/glslang_tab.cpp"
#endif
#include "../deps/glslang/glslang/SPIRV/disassemble.cpp" #include "../deps/glslang/glslang/SPIRV/disassemble.cpp"
#include "../deps/glslang/glslang/SPIRV/doc.cpp" #include "../deps/glslang/glslang/SPIRV/doc.cpp"
#include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp" #include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp"