diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-01-14 04:50:37 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-01-14 04:50:37 +0000 |
| commit | 27286d7e9c860a3ff1f452f38db660aeacf7dc88 (patch) | |
| tree | f95bb59004e334794c4a1325afb17361d20bcd8f /Graphics | |
| parent | Fixed bug in TextureUploaderD3D12 (diff) | |
| download | DiligentCore-27286d7e9c860a3ff1f452f38db660aeacf7dc88.tar.gz DiligentCore-27286d7e9c860a3ff1f452f38db660aeacf7dc88.zip | |
Fixed couple of issues in HLSL2GLSLConverterImpl and TextureUploaderGL
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsTools/src/TextureUploaderGL.cpp | 2 | ||||
| -rw-r--r-- | Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp index e4503013..06c5dfc7 100644 --- a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp +++ b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp @@ -201,7 +201,7 @@ namespace Diligent case InternalData::PendingBufferOperation::Copy: { pContext->UnmapBuffer(pBuffer->m_pStagingBuffer, MAP_WRITE); - TextureSubResData SubResData(pBuffer->m_pStagingBuffer, static_cast<Uint32>(pBuffer->GetRowStride())); + TextureSubResData SubResData(pBuffer->m_pStagingBuffer, 0, static_cast<Uint32>(pBuffer->GetRowStride())); Box DstBox; const auto &TexDesc = OperationInfo.pDstTexture->GetDesc(); DstBox.MaxX = TexDesc.Width; diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp index b7e234bb..7901aab7 100644 --- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp +++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp @@ -3885,7 +3885,7 @@ void HLSL2GLSLConverterImpl::ConversionStream::ProcessDomainShaderArguments( Tok auto VarName = BuildParameterName(MemberStack, '_', "_dsin_"); auto InputVarName = VarName + (IsPatch ? "[i]" : ""); // User-defined inputs can be declared as unbounded arrays - DefineInterfaceVar( inLocation++, RequiresFlatQualifier(Param.Type) ? "flat out" : "in", Param.Type, VarName + (IsPatch ? "[]" : ""), InterfaceVarsInSS ); + DefineInterfaceVar( inLocation++, RequiresFlatQualifier(Param.Type) ? "flat in" : "in", Param.Type, VarName + (IsPatch ? "[]" : ""), InterfaceVarsInSS ); InitVariable( FullIndexedParamName, InputVarName, PrologueSS ); } else |