diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-19 00:25:39 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-19 00:25:39 +0000 |
| commit | ff88c0507d8e8d4571b00adb421557bca1f4ed48 (patch) | |
| tree | 2382f8fad731dee624e2a1d6cb9f2f0ded6219b4 /Graphics/GraphicsEngineOpenGL | |
| parent | Fixed issues with alignment in linear allocator (diff) | |
| download | DiligentCore-ff88c0507d8e8d4571b00adb421557bca1f4ed48.tar.gz DiligentCore-ff88c0507d8e8d4571b00adb421557bca1f4ed48.zip | |
Updated third-party modules; fixed compiler warnings
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp index 914a09bb..04a08af1 100644 --- a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp @@ -311,7 +311,7 @@ void GLPipelineResourceLayout::SamplerBindInfo::BindResource(IDeviceObject* pVie { const auto& ViewDesc = pViewGL->GetDesc(); const auto& BuffDesc = pViewGL->GetBuffer()->GetDesc(); - if (!(BuffDesc.Mode == BUFFER_MODE_FORMATTED && ViewDesc.Format.ValueType != VT_UNDEFINED || BuffDesc.Mode == BUFFER_MODE_RAW)) + if (!((BuffDesc.Mode == BUFFER_MODE_FORMATTED && ViewDesc.Format.ValueType != VT_UNDEFINED) || BuffDesc.Mode == BUFFER_MODE_RAW)) { LOG_ERROR_MESSAGE("Error binding buffer view '", ViewDesc.Name, "' of buffer '", BuffDesc.Name, "' to shader variable '", m_Attribs.Name, ": formatted buffer view is expected."); @@ -361,7 +361,7 @@ void GLPipelineResourceLayout::ImageBindInfo::BindResource(IDeviceObject* pView, { const auto& ViewDesc = pViewGL->GetDesc(); const auto& BuffDesc = pViewGL->GetBuffer()->GetDesc(); - if (!(BuffDesc.Mode == BUFFER_MODE_FORMATTED && ViewDesc.Format.ValueType != VT_UNDEFINED || BuffDesc.Mode == BUFFER_MODE_RAW)) + if (!((BuffDesc.Mode == BUFFER_MODE_FORMATTED && ViewDesc.Format.ValueType != VT_UNDEFINED) || BuffDesc.Mode == BUFFER_MODE_RAW)) { LOG_ERROR_MESSAGE("Error binding buffer view '", ViewDesc.Name, "' of buffer '", BuffDesc.Name, "' to shader variable '", m_Attribs.Name, ": formatted buffer view is expected."); |