Skip to content

Commit

Permalink
Added Git submodule glslang 7.10.2984 -> stable release Nov 15, 2018
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertBeckebans committed Nov 19, 2019
1 parent cc3f1a7 commit e0a397e
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "neo/extern/glslang"]
path = neo/extern/glslang
url = https://github.com/KhronosGroup/glslang.git
14 changes: 9 additions & 5 deletions neo/CMakeLists.txt
Expand Up @@ -309,17 +309,21 @@ if(USE_VULKAN)

else()
# override Glslang build options

# options required by November 2018 release
SET_OPTION(ENABLE_SPVREMAPPER OFF)
SET_OPTION(ENABLE_GLSLANG_BINARIES OFF)
SET_OPTION(ENABLE_HLSL OFF)
SET_OPTION(ENABLE_OPT ON)
SET_OPTION(SPIRV_SKIP_EXECUTABLES ON)

# options required by November 2019 release
#SET_OPTION(ENABLE_PCH OFF)
#SET_OPTION(ENABLE_CTEST OFF)
#SET_OPTION(BUILD_EXTERNAL OFF)
#SET_OPTION(SKIP_GLSLANG_INSTALL ON)

#option(ENABLE_AMD_EXTENSIONS "Enables support of AMD-specific extensions" ON)
#option(ENABLE_NV_EXTENSIONS "Enables support of Nvidia-specific extensions" ON)
#option(ENABLE_OPT "Enables spirv-opt capability if present" ON)

set(GLSLANG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/glslang)
set(GLSLANG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/glslang)
add_subdirectory(${GLSLANG_DIR})

include_directories(${GLSLANG_DIR}/glslang)
Expand Down
4 changes: 2 additions & 2 deletions neo/astyle-code.bat
@@ -1,5 +1,5 @@
astyle.exe -v --formatted --options=astyle-options.ini --exclude="libs" --recursive *.h
astyle.exe -v --formatted --options=astyle-options.ini --exclude="libs" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" --exclude="sys/win32/win_cpu.cpp" --exclude="sys/win32/win_main.cpp" --recursive *.cpp
astyle.exe -v --formatted --options=astyle-options.ini --exclude="libs" --exclude="extern" --recursive *.h
astyle.exe -v --formatted --options=astyle-options.ini --exclude="libs" --exclude="extern" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" --exclude="sys/win32/win_cpu.cpp" --exclude="sys/win32/win_main.cpp" --recursive *.cpp

astyle.exe -v --formatted --options=astyle-options.ini --recursive libs/imgui/*.h
astyle.exe -v --formatted --options=astyle-options.ini --recursive libs/imgui/*.cpp
Expand Down
4 changes: 2 additions & 2 deletions neo/astyle-code.sh
Expand Up @@ -34,6 +34,6 @@ if [ "$ASTYLE_VERSION" != "$OUR_ASTYLE_VERSION" ]; then
exit 1
fi

$ASTYLE_BIN -v --formatted --options=astyle-options.ini --exclude="libs" --recursive "*.h"
$ASTYLE_BIN -v --formatted --options=astyle-options.ini --exclude="libs" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" \
$ASTYLE_BIN -v --formatted --options=astyle-options.ini --exclude="libs" --exclude="extern" --recursive "*.h"
$ASTYLE_BIN -v --formatted --options=astyle-options.ini --exclude="libs" --exclude="extern" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" \
--exclude="sys/win32/win_cpu.cpp" --exclude="sys/win32/win_main.cpp" --recursive "*.cpp"
1 change: 1 addition & 0 deletions neo/extern/glslang
Submodule glslang added at 1bc601
2 changes: 1 addition & 1 deletion neo/renderer/Vulkan/RenderBackend_VK.cpp
Expand Up @@ -45,7 +45,7 @@ idCVar r_syncEveryFrame( "r_syncEveryFrame", "1", CVAR_BOOL, "Don't let the GPU

// NEW VULKAN STUFF

idCVar r_vkEnableValidationLayers( "r_vkEnableValidationLayers", "0", CVAR_BOOL, "" );
idCVar r_vkEnableValidationLayers( "r_vkEnableValidationLayers", "0", CVAR_BOOL | CVAR_INIT, "" );

vulkanContext_t vkcontext;

Expand Down
12 changes: 12 additions & 0 deletions neo/renderer/Vulkan/RenderProgs_VK.cpp
Expand Up @@ -409,6 +409,8 @@ namespace glslang
#if 0
extern const TBuiltInResource DefaultTBuiltInResource;
#else

// RB: see RBDOOM-3-BFG\neo\extern\glslang\StandAlone\ResourceLimits.cpp
const TBuiltInResource DefaultTBuiltInResource =
{
/* .MaxLights = */ 32,
Expand Down Expand Up @@ -494,6 +496,16 @@ const TBuiltInResource DefaultTBuiltInResource =
/* .MaxCullDistances = */ 8,
/* .MaxCombinedClipAndCullDistances = */ 8,
/* .MaxSamples = */ 4,
/* .maxMeshOutputVerticesNV = */ 256,
/* .maxMeshOutputPrimitivesNV = */ 512,
/* .maxMeshWorkGroupSizeX_NV = */ 32,
/* .maxMeshWorkGroupSizeY_NV = */ 1,
/* .maxMeshWorkGroupSizeZ_NV = */ 1,
/* .maxTaskWorkGroupSizeX_NV = */ 32,
/* .maxTaskWorkGroupSizeY_NV = */ 1,
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4,

/* .limits = */ {
/* .nonInductiveForLoops = */ 1,
/* .whileLoops = */ 1,
Expand Down

0 comments on commit e0a397e

Please sign in to comment.