From 10cd33e0e314cc02ac9779130b8cf9cc38867b4b Mon Sep 17 00:00:00 2001 From: assiduous Date: Mon, 27 Jan 2020 11:01:19 -0800 Subject: Reworked C interfaces to share declaration with c++ --- Graphics/GLSLTools/src/GLSLSourceBuilder.cpp | 2 +- Graphics/GLSLTools/src/SPIRVUtils.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Graphics/GLSLTools') 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(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 pFileData(MakeNewRCObj()(0)); - pSourceStream->Read(pFileData); + pSourceStream->ReadBlob(pFileData); auto* pNewInclude = new IncludeResult{ headerName, @@ -462,7 +462,7 @@ std::vector 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(pFileData->GetDataPtr()); SourceCodeLen = static_cast(pFileData->GetSize()); } -- cgit v1.2.3