From 95a90d7fda3097d085cde1fea5213667277e729b Mon Sep 17 00:00:00 2001 From: Yong He Date: Fri, 4 Jun 2021 14:32:22 -0700 Subject: Fix D3D11 `uploadBufferResource`. (#1869) --- tools/gfx/open-gl/render-gl.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'tools/gfx/open-gl/render-gl.cpp') diff --git a/tools/gfx/open-gl/render-gl.cpp b/tools/gfx/open-gl/render-gl.cpp index 5b1ea2c3e..cd4811911 100644 --- a/tools/gfx/open-gl/render-gl.cpp +++ b/tools/gfx/open-gl/render-gl.cpp @@ -152,7 +152,7 @@ public: ITextureResource* texture, ResourceState state, ISlangBlob** outBlob, size_t* outRowPitch, size_t* outPixelSize) override; virtual void* map(IBufferResource* buffer, MapFlavor flavor) override; - virtual void unmap(IBufferResource* buffer) override; + virtual void unmap(IBufferResource* buffer, size_t offsetWritten, size_t sizeWritten) override; virtual void setPrimitiveTopology(PrimitiveTopology topology) override; virtual void setVertexBuffers( @@ -1937,7 +1937,12 @@ HGLRC GLDevice::createGLContext(HDC hdc) SLANG_NO_THROW Result SLANG_MCALL GLDevice::initialize(const Desc& desc) { - SLANG_RETURN_ON_FAIL(slangContext.initialize(desc.slang, SLANG_GLSL, "glsl_440")); + SLANG_RETURN_ON_FAIL(slangContext.initialize( + desc.slang, + SLANG_GLSL, + "glsl_440", + makeArray( + slang::PreprocessorMacroDesc{ "__GL__", "1" }).getView())); SLANG_RETURN_ON_FAIL(RendererBase::initialize(desc)); @@ -2557,8 +2562,10 @@ void* GLDevice::map(IBufferResource* bufferIn, MapFlavor flavor) return glMapBuffer(buffer->m_target, access); } -void GLDevice::unmap(IBufferResource* bufferIn) +void GLDevice::unmap(IBufferResource* bufferIn, size_t offsetWritten, size_t sizeWritten) { + SLANG_UNUSED(offsetWritten); + SLANG_UNUSED(sizeWritten); BufferResourceImpl* buffer = static_cast(bufferIn); glUnmapBuffer(buffer->m_target); } -- cgit v1.2.3