summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2019-06-18 11:33:08 +0200
committerGitHub <noreply@github.com>2019-06-18 11:33:08 +0200
commitff96dc0e6ffd250b23ccb5ebceb12623da604435 (patch)
tree1a1279d6bff0945ae575c195ec357af239896d8f /Source/Core/VideoBackends
parentac562279c3a9fe9cc660b703ed0fd3f8ab2be758 (diff)
parent72b04a353ddfa79ec10fe447bef8eeaefc824976 (diff)
Merge pull request #8199 from lioncash/namespace
General: Use nested namespace specifiers where applicable
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp8
-rw-r--r--Source/Core/VideoBackends/Vulkan/ShaderCompiler.h8
2 files changed, 4 insertions, 12 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp
index e9551e319e..a245935995 100644
--- a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp
+++ b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp
@@ -24,9 +24,7 @@
#include "VideoCommon/VideoConfig.h"
-namespace Vulkan
-{
-namespace ShaderCompiler
+namespace Vulkan::ShaderCompiler
{
// Registers itself for cleanup via atexit
bool InitializeGlslang();
@@ -375,6 +373,4 @@ std::optional<SPIRVCodeVector> CompileComputeShader(std::string_view source_code
{
return CompileShaderToSPV(EShLangCompute, "cs", source_code, COMPUTE_SHADER_HEADER);
}
-
-} // namespace ShaderCompiler
-} // namespace Vulkan
+} // namespace Vulkan::ShaderCompiler
diff --git a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.h b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.h
index 7f96968555..9a38f207df 100644
--- a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.h
+++ b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.h
@@ -11,9 +11,7 @@
#include "Common/CommonTypes.h"
-namespace Vulkan
-{
-namespace ShaderCompiler
+namespace Vulkan::ShaderCompiler
{
// SPIR-V compiled code type
using SPIRVCodeType = u32;
@@ -30,6 +28,4 @@ std::optional<SPIRVCodeVector> CompileFragmentShader(std::string_view source_cod
// Compile a compute shader to SPIR-V.
std::optional<SPIRVCodeVector> CompileComputeShader(std::string_view source_code);
-
-} // namespace ShaderCompiler
-} // namespace Vulkan
+} // namespace Vulkan::ShaderCompiler