summaryrefslogtreecommitdiffstats
path: root/tools/gfx/open-gl/render-gl.cpp
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2021-06-04 14:32:22 -0700
committerGitHub <noreply@github.com>2021-06-04 14:32:22 -0700
commit95a90d7fda3097d085cde1fea5213667277e729b (patch)
tree54558aabdaaa27b2298a214781e13218cc3881e9 /tools/gfx/open-gl/render-gl.cpp
parentbf068b17406a202ae3112f5617bbb4da595c9ae9 (diff)
Fix D3D11 `uploadBufferResource`. (#1869)
Diffstat (limited to 'tools/gfx/open-gl/render-gl.cpp')
-rw-r--r--tools/gfx/open-gl/render-gl.cpp13
1 files changed, 10 insertions, 3 deletions
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<BufferResourceImpl*>(bufferIn);
glUnmapBuffer(buffer->m_target);
}