diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-09-08 14:31:12 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-09-08 14:31:12 +0000 |
| commit | ff63b62418892f045f249c29a4a5a3972631e49c (patch) | |
| tree | 290413be210355e1c8b49c4f4cb50f95cf406e69 /Graphics/GraphicsEngine | |
| parent | Added pDxCompilerPath to engine create info, (diff) | |
| download | DiligentCore-ff63b62418892f045f249c29a4a5a3972631e49c.tar.gz DiligentCore-ff63b62418892f045f249c29a4a5a3972631e49c.zip | |
fixed message text and docs
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/DeviceContextBase.hpp | 16 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/PipelineState.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp index fbb1e210..86cccc7b 100644 --- a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp +++ b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp @@ -1431,7 +1431,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: if (m_pPipelineState->GetDesc().PipelineType != PIPELINE_TYPE_GRAPHICS) { - LOG_ERROR_MESSAGE("Draw command arguments are invalid: pipeline state '", m_pPipelineState->GetDesc().Name, "' is a compute pipeline."); + LOG_ERROR_MESSAGE("Draw command arguments are invalid: pipeline state '", m_pPipelineState->GetDesc().Name, "' is not a graphics pipeline."); return false; } @@ -1459,7 +1459,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: if (m_pPipelineState->GetDesc().PipelineType != PIPELINE_TYPE_GRAPHICS) { LOG_ERROR_MESSAGE("DrawIndexed command arguments are invalid: pipeline state '", - m_pPipelineState->GetDesc().Name, "' is a compute pipeline."); + m_pPipelineState->GetDesc().Name, "' is not a graphics pipeline."); return false; } @@ -1500,7 +1500,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: if (m_pPipelineState->GetDesc().PipelineType != PIPELINE_TYPE_MESH) { LOG_ERROR_MESSAGE("DrawMesh command arguments are invalid: pipeline state '", - m_pPipelineState->GetDesc().Name, "' is a compute pipeline."); + m_pPipelineState->GetDesc().Name, "' is not a mesh pipeline."); return false; } @@ -1529,7 +1529,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: { LOG_ERROR_MESSAGE("DrawIndirect command arguments are invalid: pipeline state '", - m_pPipelineState->GetDesc().Name, "' is a compute pipeline."); + m_pPipelineState->GetDesc().Name, "' is not a graphics pipeline."); return false; } @@ -1574,7 +1574,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: if (m_pPipelineState->GetDesc().PipelineType != PIPELINE_TYPE_GRAPHICS) { LOG_ERROR_MESSAGE("DrawIndexedIndirect command arguments are invalid: pipeline state '", - m_pPipelineState->GetDesc().Name, "' is a compute pipeline."); + m_pPipelineState->GetDesc().Name, "' is not a graphics pipeline."); return false; } @@ -1632,7 +1632,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: if (m_pPipelineState->GetDesc().PipelineType != PIPELINE_TYPE_MESH) { LOG_ERROR_MESSAGE("DrawMeshIndirect command arguments are invalid: pipeline state '", - m_pPipelineState->GetDesc().Name, "' is a compute pipeline."); + m_pPipelineState->GetDesc().Name, "' is not a mesh pipeline."); return false; } @@ -1721,7 +1721,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: if (m_pPipelineState->GetDesc().PipelineType != PIPELINE_TYPE_COMPUTE) { LOG_ERROR_MESSAGE("DispatchCompute command arguments are invalid: pipeline state '", m_pPipelineState->GetDesc().Name, - "' is a graphics pipeline."); + "' is not a compute pipeline."); return false; } @@ -1756,7 +1756,7 @@ inline bool DeviceContextBase<BaseInterface, ImplementationTraits>:: if (m_pPipelineState->GetDesc().PipelineType != PIPELINE_TYPE_COMPUTE) { LOG_ERROR_MESSAGE("DispatchComputeIndirect command arguments are invalid: pipeline state '", - m_pPipelineState->GetDesc().Name, "' is a graphics pipeline."); + m_pPipelineState->GetDesc().Name, "' is not a compute pipeline."); return false; } diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h index 271ed607..d4361fde 100644 --- a/Graphics/GraphicsEngine/interface/PipelineState.h +++ b/Graphics/GraphicsEngine/interface/PipelineState.h @@ -276,10 +276,10 @@ struct PipelineStateDesc DILIGENT_DERIVE(DeviceObjectAttribs) /// Pipeline layout description PipelineResourceLayoutDesc ResourceLayout; - /// Graphics pipeline state description. This memeber is ignored if PipelineType == PIPELINE_TYPE_GRAPHICS or PIPELINE_TYPE_MESH + /// Graphics pipeline state description. This memeber is ignored if PipelineType != PIPELINE_TYPE_GRAPHICS or PIPELINE_TYPE_MESH GraphicsPipelineDesc GraphicsPipeline; - /// Compute pipeline state description. This memeber is ignored if PipelineType == PIPELINE_TYPE_COMPUTE + /// Compute pipeline state description. This memeber is ignored if PipelineType != PIPELINE_TYPE_COMPUTE ComputePipelineDesc ComputePipeline; #if DILIGENT_CPP_INTERFACE |
