mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move hlsl/ source to glslang/HLSL/

Browse Source 
Now that the HLSL source files are part of the `glslang` target (#2271), it makes sense for these to sit in the `glslang` directory.

Changed the case of the directory from `hlsl` to `HLSL` to better match the sibling directories.
This commit is contained in:
Ben Clayton 2020-06-16 11:54:34 +01:00
parent 4928d556e6
commit f49820dd6b
24 changed files with 124 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Android.mk
View File

@ -27,15 +27,15 @@ include $(CLEAR_VARS)
LOCAL_MODULE:=HLSL LOCAL_MODULE:=HLSL
LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_DEFINES) LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_DEFINES)
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
hlsl/hlslAttributes.cpp \ glslang/HLSL/hlslAttributes.cpp \
hlsl/hlslGrammar.cpp \ glslang/HLSL/hlslGrammar.cpp \
hlsl/hlslOpMap.cpp \ glslang/HLSL/hlslOpMap.cpp \
hlsl/hlslParseables.cpp \ glslang/HLSL/hlslParseables.cpp \
hlsl/hlslParseHelper.cpp \ glslang/HLSL/hlslParseHelper.cpp \
hlsl/hlslScanContext.cpp \ glslang/HLSL/hlslScanContext.cpp \
hlsl/hlslTokenStream.cpp glslang/HLSL/hlslTokenStream.cpp
LOCAL_C_INCLUDES:=$(LOCAL_PATH) \ LOCAL_C_INCLUDES:=$(LOCAL_PATH) \
$(LOCAL_PATH)/hlsl $(LOCAL_PATH)/glslang/HLSL
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)

8
BUILD.bazel
View File

@ -34,15 +34,15 @@ cc_library(
srcs = glob( srcs = glob(
[ [
"glslang/GenericCodeGen/*.cpp", "glslang/GenericCodeGen/*.cpp",
"glslang/HLSL/*.cpp",
"glslang/MachineIndependent/*.cpp", "glslang/MachineIndependent/*.cpp",
"glslang/MachineIndependent/preprocessor/*.cpp", "glslang/MachineIndependent/preprocessor/*.cpp",
"hlsl/*.cpp",
], ],
exclude = [ exclude = [
"glslang/HLSL/pch.cpp",
"glslang/HLSL/pch.h",
"glslang/MachineIndependent/pch.cpp", "glslang/MachineIndependent/pch.cpp",
"glslang/MachineIndependent/pch.h", "glslang/MachineIndependent/pch.h",
"hlsl/pch.cpp",
"hlsl/pch.h",
], ],
) + [ ) + [
"OGLCompilersDLL/InitializeDll.cpp", "OGLCompilersDLL/InitializeDll.cpp",
@ -53,10 +53,10 @@ cc_library(
["glslang/OSDependent/Unix/ossource.cpp"], ["glslang/OSDependent/Unix/ossource.cpp"],
}), }),
hdrs = glob([ hdrs = glob([
"glslang/HLSL/*.h",
"glslang/Include/*.h", "glslang/Include/*.h",
"glslang/MachineIndependent/*.h", "glslang/MachineIndependent/*.h",
"glslang/MachineIndependent/preprocessor/*.h", "glslang/MachineIndependent/preprocessor/*.h",
"hlsl/*.h",
]) + [ ]) + [
"OGLCompilersDLL/InitializeDll.h", "OGLCompilersDLL/InitializeDll.h",
"StandAlone/DirStackFileIncluder.h", "StandAlone/DirStackFileIncluder.h",

30
BUILD.gn
View File

@ -88,6 +88,21 @@ source_set("glslang_sources") {
"SPIRV/spvIR.h", "SPIRV/spvIR.h",
"glslang/GenericCodeGen/CodeGen.cpp", "glslang/GenericCodeGen/CodeGen.cpp",
"glslang/GenericCodeGen/Link.cpp", "glslang/GenericCodeGen/Link.cpp",
"glslang/HLSL/hlslAttributes.cpp",
"glslang/HLSL/hlslAttributes.h",
"glslang/HLSL/hlslGrammar.cpp",
"glslang/HLSL/hlslGrammar.h",
"glslang/HLSL/hlslOpMap.cpp",
"glslang/HLSL/hlslOpMap.h",
"glslang/HLSL/hlslParseables.cpp",
"glslang/HLSL/hlslParseables.h",
"glslang/HLSL/hlslParseHelper.cpp",
"glslang/HLSL/hlslParseHelper.h",
"glslang/HLSL/hlslScanContext.cpp",
"glslang/HLSL/hlslScanContext.h",
"glslang/HLSL/hlslTokens.h",
"glslang/HLSL/hlslTokenStream.cpp",
"glslang/HLSL/hlslTokenStream.h",
"glslang/Include/BaseTypes.h", "glslang/Include/BaseTypes.h",
"glslang/Include/Common.h", "glslang/Include/Common.h",
"glslang/Include/ConstantUnion.h", "glslang/Include/ConstantUnion.h",
@ -147,21 +162,6 @@ source_set("glslang_sources") {
"glslang/MachineIndependent/reflection.h", "glslang/MachineIndependent/reflection.h",
"glslang/OSDependent/osinclude.h", "glslang/OSDependent/osinclude.h",
"glslang/Public/ShaderLang.h", "glslang/Public/ShaderLang.h",
"hlsl/hlslAttributes.cpp",
"hlsl/hlslAttributes.h",
"hlsl/hlslGrammar.cpp",
"hlsl/hlslGrammar.h",
"hlsl/hlslOpMap.cpp",
"hlsl/hlslOpMap.h",
"hlsl/hlslParseHelper.cpp",
"hlsl/hlslParseHelper.h",
"hlsl/hlslParseables.cpp",
"hlsl/hlslParseables.h",
"hlsl/hlslScanContext.cpp",
"hlsl/hlslScanContext.h",
"hlsl/hlslTokenStream.cpp",
"hlsl/hlslTokenStream.h",
"hlsl/hlslTokens.h",
] ]
defines = [ "ENABLE_OPT=1" ] defines = [ "ENABLE_OPT=1" ]

30
glslang/CMakeLists.txt
View File

@ -84,23 +84,23 @@ glslang_pch(SOURCES MachineIndependent/pch.cpp)
if(ENABLE_HLSL) if(ENABLE_HLSL)
list(APPEND SOURCES list(APPEND SOURCES
../hlsl/hlslAttributes.cpp HLSL/hlslAttributes.cpp
../hlsl/hlslParseHelper.cpp HLSL/hlslParseHelper.cpp
../hlsl/hlslScanContext.cpp HLSL/hlslScanContext.cpp
../hlsl/hlslOpMap.cpp HLSL/hlslOpMap.cpp
../hlsl/hlslTokenStream.cpp HLSL/hlslTokenStream.cpp
../hlsl/hlslGrammar.cpp HLSL/hlslGrammar.cpp
../hlsl/hlslParseables.cpp) HLSL/hlslParseables.cpp)
list(APPEND HEADERS list(APPEND HEADERS
../hlsl/hlslAttributes.h HLSL/hlslAttributes.h
../hlsl/hlslParseHelper.h HLSL/hlslParseHelper.h
../hlsl/hlslTokens.h HLSL/hlslTokens.h
../hlsl/hlslScanContext.h HLSL/hlslScanContext.h
../hlsl/hlslOpMap.h HLSL/hlslOpMap.h
../hlsl/hlslTokenStream.h HLSL/hlslTokenStream.h
../hlsl/hlslGrammar.h HLSL/hlslGrammar.h
../hlsl/hlslParseables.h) HLSL/hlslParseables.h)
endif(ENABLE_HLSL) endif(ENABLE_HLSL)
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})

0
hlsl/hlslAttributes.cpp → glslang/HLSL/hlslAttributes.cpp
View File

4
hlsl/hlslAttributes.h → glslang/HLSL/hlslAttributes.h
View File

@ -39,8 +39,8 @@
#include <unordered_map> #include <unordered_map>
#include <functional> #include <functional>
#include "../glslang/MachineIndependent/attribute.h" #include "../MachineIndependent/attribute.h"
#include "../glslang/MachineIndependent/SymbolTable.h" #include "../MachineIndependent/SymbolTable.h"
#include "hlslScanContext.h" #include "hlslScanContext.h"
namespace glslang { namespace glslang {

0
hlsl/hlslGrammar.cpp → glslang/HLSL/hlslGrammar.cpp
View File

0
hlsl/hlslGrammar.h → glslang/HLSL/hlslGrammar.h
View File

0
hlsl/hlslOpMap.cpp → glslang/HLSL/hlslOpMap.cpp
View File

0
hlsl/hlslOpMap.h → glslang/HLSL/hlslOpMap.h
View File

8
hlsl/hlslParseHelper.cpp → glslang/HLSL/hlslParseHelper.cpp
View File

@ -39,11 +39,11 @@
#include "hlslGrammar.h" #include "hlslGrammar.h"
#include "hlslAttributes.h" #include "hlslAttributes.h"
#include "../glslang/Include/Common.h" #include "../Include/Common.h"
#include "../glslang/MachineIndependent/Scan.h" #include "../MachineIndependent/Scan.h"
#include "../glslang/MachineIndependent/preprocessor/PpContext.h" #include "../MachineIndependent/preprocessor/PpContext.h"
#include "../glslang/OSDependent/osinclude.h" #include "../OSDependent/osinclude.h"
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>

6
hlsl/hlslParseHelper.h → glslang/HLSL/hlslParseHelper.h
View File

@ -36,9 +36,9 @@
#ifndef HLSL_PARSE_INCLUDED_ #ifndef HLSL_PARSE_INCLUDED_
#define HLSL_PARSE_INCLUDED_ #define HLSL_PARSE_INCLUDED_
#include "../glslang/MachineIndependent/parseVersions.h" #include "../MachineIndependent/parseVersions.h"
#include "../glslang/MachineIndependent/ParseHelper.h" #include "../MachineIndependent/ParseHelper.h"
#include "../glslang/MachineIndependent/attribute.h" #include "../MachineIndependent/attribute.h"
#include <array> #include <array>

0
hlsl/hlslParseables.cpp → glslang/HLSL/hlslParseables.cpp
View File

2
hlsl/hlslParseables.h → glslang/HLSL/hlslParseables.h
View File

@ -36,7 +36,7 @@
#ifndef _HLSLPARSEABLES_INCLUDED_ #ifndef _HLSLPARSEABLES_INCLUDED_
#define _HLSLPARSEABLES_INCLUDED_ #define _HLSLPARSEABLES_INCLUDED_
#include "../glslang/MachineIndependent/Initialize.h" #include "../MachineIndependent/Initialize.h"
namespace glslang { namespace glslang {

10
hlsl/hlslScanContext.cpp → glslang/HLSL/hlslScanContext.cpp
View File

@ -42,15 +42,15 @@
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
#include "../glslang/Include/Types.h" #include "../Include/Types.h"
#include "../glslang/MachineIndependent/SymbolTable.h" #include "../MachineIndependent/SymbolTable.h"
#include "../glslang/MachineIndependent/ParseHelper.h" #include "../MachineIndependent/ParseHelper.h"
#include "hlslScanContext.h" #include "hlslScanContext.h"
#include "hlslTokens.h" #include "hlslTokens.h"
// preprocessor includes // preprocessor includes
#include "../glslang/MachineIndependent/preprocessor/PpContext.h" #include "../MachineIndependent/preprocessor/PpContext.h"
#include "../glslang/MachineIndependent/preprocessor/PpTokens.h" #include "../MachineIndependent/preprocessor/PpTokens.h"
namespace { namespace {

2
hlsl/hlslScanContext.h → glslang/HLSL/hlslScanContext.h
View File

@ -41,7 +41,7 @@
#ifndef HLSLSCANCONTEXT_H_ #ifndef HLSLSCANCONTEXT_H_
#define HLSLSCANCONTEXT_H_ #define HLSLSCANCONTEXT_H_
#include "../glslang/MachineIndependent/ParseHelper.h" #include "../MachineIndependent/ParseHelper.h"
#include "hlslTokens.h" #include "hlslTokens.h"
namespace glslang { namespace glslang {

0
hlsl/hlslTokenStream.cpp → glslang/HLSL/hlslTokenStream.cpp
View File

0
hlsl/hlslTokenStream.h → glslang/HLSL/hlslTokenStream.h
View File

0
hlsl/hlslTokens.h → glslang/HLSL/hlslTokens.h
View File

0
hlsl/pch.cpp → glslang/HLSL/pch.cpp
View File

15
hlsl/pch.h → glslang/HLSL/pch.h
View File

@ -34,21 +34,20 @@
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
// //
#include "hlslAttributes.h"
#include "hlslGrammar.h"
#include "hlslParseHelper.h" #include "hlslParseHelper.h"
#include "hlslScanContext.h" #include "hlslScanContext.h"
#include "hlslGrammar.h"
#include "hlslAttributes.h"
#include "../glslang/MachineIndependent/Scan.h" #include "../MachineIndependent/Scan.h"
#include "../glslang/MachineIndependent/preprocessor/PpContext.h" #include "../MachineIndependent/preprocessor/PpContext.h"
#include "../glslang/OSDependent/osinclude.h" #include "../OSDependent/osinclude.h"
#include <algorithm> #include <algorithm>
#include <functional>
#include <cctype>
#include <array> #include <array>
#include <cctype>
#include <functional>
#include <set> #include <set>
#endif /* _PCH_H */ #endif /* _PCH_H */

6
glslang/MachineIndependent/ShaderLang.cpp
View File

@ -51,9 +51,9 @@
#include "ScanContext.h" #include "ScanContext.h"
#ifdef ENABLE_HLSL #ifdef ENABLE_HLSL
#include "../../hlsl/hlslParseHelper.h" #include "../HLSL/hlslParseHelper.h"
#include "../../hlsl/hlslParseables.h" #include "../HLSL/hlslParseables.h"
#include "../../hlsl/hlslScanContext.h" #include "../HLSL/hlslScanContext.h"
#endif #endif
#include "../Include/ShHandle.h" #include "../Include/ShHandle.h"

1
hlsl/CMakeLists.txt
View File

@ -1,6 +1,7 @@
# The HLSL source is directly embedded into the glslang target when ENABLE_HLSL # The HLSL source is directly embedded into the glslang target when ENABLE_HLSL
# is set. # is set.
# This source now lives at: glslang/HLSL/
# The HLSL target is now just a stub that exists for backwards compatibility for # The HLSL target is now just a stub that exists for backwards compatibility for
# projects that referenced this target. # projects that referenced this target.

1
hlsl/stub.cpp
View File

@ -35,6 +35,7 @@
// The HLSL source is directly embedded into the glslang target when ENABLE_HLSL // The HLSL source is directly embedded into the glslang target when ENABLE_HLSL
// is set. // is set.
// This source now lives at: glslang/HLSL/
// The HLSL target is now just a stub that exists for backwards compatibility // The HLSL target is now just a stub that exists for backwards compatibility
// for projects that referenced this target. As a target requires at least one // for projects that referenced this target. As a target requires at least one
// source file to build, this file acts as that stub. // source file to build, this file acts as that stub.