diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-27 19:01:19 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-27 19:01:19 +0000 |
| commit | 10cd33e0e314cc02ac9779130b8cf9cc38867b4b (patch) | |
| tree | 128d77a72818216a081b81bfde0d5e8e92292339 /Graphics/GLSLTools | |
| parent | Implemented D3D11 engine C interface (mostly) (diff) | |
| download | DiligentCore-10cd33e0e314cc02ac9779130b8cf9cc38867b4b.tar.gz DiligentCore-10cd33e0e314cc02ac9779130b8cf9cc38867b4b.zip | |
Reworked C interfaces to share declaration with c++
Diffstat (limited to 'Graphics/GLSLTools')
| -rw-r--r-- | Graphics/GLSLTools/src/GLSLSourceBuilder.cpp | 2 | ||||
| -rw-r--r-- | Graphics/GLSLTools/src/SPIRVUtils.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp index d415aee2..984564a8 100644 --- a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp +++ b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp @@ -297,7 +297,7 @@ String BuildGLSLSourceString(const ShaderCreateInfo& CreationAttribs, if (pSourceStream == nullptr) LOG_ERROR_AND_THROW("Failed to open shader source file"); - pSourceStream->Read(pFileData); + pSourceStream->ReadBlob(pFileData); ShaderSource = reinterpret_cast<char*>(pFileData->GetDataPtr()); SourceLen = pFileData->GetSize(); } diff --git a/Graphics/GLSLTools/src/SPIRVUtils.cpp b/Graphics/GLSLTools/src/SPIRVUtils.cpp index 47c1c563..bccee8dc 100644 --- a/Graphics/GLSLTools/src/SPIRVUtils.cpp +++ b/Graphics/GLSLTools/src/SPIRVUtils.cpp @@ -394,7 +394,7 @@ public: } RefCntAutoPtr<IDataBlob> pFileData(MakeNewRCObj<DataBlobImpl>()(0)); - pSourceStream->Read(pFileData); + pSourceStream->ReadBlob(pFileData); auto* pNewInclude = new IncludeResult{ headerName, @@ -462,7 +462,7 @@ std::vector<unsigned int> HLSLtoSPIRV(const ShaderCreateInfo& Attribs, IDataBlob if (pSourceStream == nullptr) LOG_ERROR_AND_THROW("Failed to open shader source file"); - pSourceStream->Read(pFileData); + pSourceStream->ReadBlob(pFileData); SourceCode = reinterpret_cast<char*>(pFileData->GetDataPtr()); SourceCodeLen = static_cast<int>(pFileData->GetSize()); } |