summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngine
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-09-10 04:47:03 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-09-10 04:47:03 +0000
commit02742f2efe4d400dc3562730badb5ea13aaa0876 (patch)
treefc41669e1583c22af650cff12746a9f3347bb50c /Graphics/GraphicsEngine
parentFixed merge conflicts (diff)
downloadDiligentCore-02742f2efe4d400dc3562730badb5ea13aaa0876.tar.gz
DiligentCore-02742f2efe4d400dc3562730badb5ea13aaa0876.zip
Another set of minor updates to mesh shader implementation
Diffstat (limited to 'Graphics/GraphicsEngine')
-rw-r--r--Graphics/GraphicsEngine/include/ShaderBase.hpp2
-rw-r--r--Graphics/GraphicsEngine/interface/DeviceContext.h2
-rw-r--r--Graphics/GraphicsEngine/interface/GraphicsTypes.h4
-rw-r--r--Graphics/GraphicsEngine/interface/PipelineState.h4
-rw-r--r--Graphics/GraphicsEngine/interface/Shader.h2
5 files changed, 7 insertions, 7 deletions
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