From 72b04a353ddfa79ec10fe447bef8eeaefc824976 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 17 Jun 2019 16:57:30 -0400 Subject: [PATCH] VideoBackends/Vulkan: Use nested namespace specifiers where applicable --- Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp | 8 ++------ Source/Core/VideoBackends/Vulkan/ShaderCompiler.h | 8 ++------ 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 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 CompileFragmentShader(std::string_view source_cod // Compile a compute shader to SPIR-V. std::optional CompileComputeShader(std::string_view source_code); - -} // namespace ShaderCompiler -} // namespace Vulkan +} // namespace Vulkan::ShaderCompiler