From 02742f2efe4d400dc3562730badb5ea13aaa0876 Mon Sep 17 00:00:00 2001 From: assiduous Date: Wed, 9 Sep 2020 21:47:03 -0700 Subject: Another set of minor updates to mesh shader implementation --- Graphics/GraphicsEngine/include/ShaderBase.hpp | 2 +- Graphics/GraphicsEngine/interface/DeviceContext.h | 2 +- Graphics/GraphicsEngine/interface/GraphicsTypes.h | 4 ++-- Graphics/GraphicsEngine/interface/PipelineState.h | 4 ++-- Graphics/GraphicsEngine/interface/Shader.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/include/ShaderBase.hpp b/Graphics/GraphicsEngine/include/ShaderBase.hpp index 17dec618..5b39da79 100644 --- a/Graphics/GraphicsEngine/include/ShaderBase.hpp +++ b/Graphics/GraphicsEngine/include/ShaderBase.hpp @@ -54,7 +54,7 @@ inline Int32 GetShaderTypeIndex(SHADER_TYPE Type) Int32 ShaderIndex = PlatformMisc::GetLSB(Type); #ifdef DILIGENT_DEBUG - static_assert(SHADER_TYPE_LAST == SHADER_TYPE_MESH, "Please update the switch below to handle the new shader type"); + static_assert(SHADER_TYPE_LAST == 0x080, "Please update the switch below to handle the new shader type"); switch (Type) { // clang-format off diff --git a/Graphics/GraphicsEngine/interface/DeviceContext.h b/Graphics/GraphicsEngine/interface/DeviceContext.h index 18e53478..272c2cd5 100644 --- a/Graphics/GraphicsEngine/interface/DeviceContext.h +++ b/Graphics/GraphicsEngine/interface/DeviceContext.h @@ -1089,7 +1089,7 @@ DILIGENT_BEGIN_INTERFACE(IDeviceContext, IObject) /// Uint32 TaskCount; /// Uint32 FirstTask; /// - /// \remarks For compatibility between Direct3D12 and Vulkan and with direct call (DrawMesh) use define the first element in the structure, + /// \remarks For compatibility between Direct3D12 and Vulkan and with direct call (DrawMesh) use the first element in the structure, /// for example: Direct3D12 {TaskCount, 1, 1}, Vulkan {TaskCount, 0}. /// /// \remarks If IndirectAttribsBufferStateTransitionMode member is Diligent::RESOURCE_STATE_TRANSITION_MODE_TRANSITION, diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index 40ac9671..323a3fd1 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -1743,10 +1743,10 @@ typedef struct VulkanDescriptorPoolSize VulkanDescriptorPoolSize; struct EngineVkCreateInfo DILIGENT_DERIVE(EngineCreateInfo) /// Id of the hardware adapter the engine should be initialized on. - Uint32 AdapterId DEFAULT_INITIALIZER(DEFAULT_ADAPTER_ID); + Uint32 AdapterId DEFAULT_INITIALIZER(DEFAULT_ADAPTER_ID); /// Enable Vulkan validation layers. - bool EnableValidation DEFAULT_INITIALIZER(false); + bool EnableValidation DEFAULT_INITIALIZER(false); /// Number of global Vulkan extensions Uint32 GlobalExtensionCount DEFAULT_INITIALIZER(0); diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h index 7fe2fbb6..9491168d 100644 --- a/Graphics/GraphicsEngine/interface/PipelineState.h +++ b/Graphics/GraphicsEngine/interface/PipelineState.h @@ -166,10 +166,10 @@ struct GraphicsPipelineDesc /// Geometry shader to be used with the pipeline. IShader* pGS DEFAULT_INITIALIZER(nullptr); - /// Amplification shader to be used with the pipeline + /// Amplification shader to be used with the pipeline. IShader* pAS DEFAULT_INITIALIZER(nullptr); - /// Mesh shader to be used with the pipeline + /// Mesh shader to be used with the pipeline. IShader* pMS DEFAULT_INITIALIZER(nullptr); //D3D12_STREAM_OUTPUT_DESC StreamOutput; diff --git a/Graphics/GraphicsEngine/interface/Shader.h b/Graphics/GraphicsEngine/interface/Shader.h index 7cffb0f1..d961b962 100644 --- a/Graphics/GraphicsEngine/interface/Shader.h +++ b/Graphics/GraphicsEngine/interface/Shader.h @@ -85,7 +85,7 @@ DILIGENT_TYPED_ENUM(SHADER_SOURCE_LANGUAGE, Uint32) /// Describes the shader compiler that will be used to compile the shader source code DILIGENT_TYPED_ENUM(SHADER_COMPILER, Uint32) { - /// Default compiler for specific language and API that is chosen as follows: + /// Default compiler for specific language and API that is selected as follows: /// - Direct3D11: legacy HLSL compiler (FXC) /// - Direct3D12: legacy HLSL compiler (FXC) /// - OpenGL(ES) GLSL: native compiler -- cgit v1.2.3