diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-23 19:08:11 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-23 19:08:11 +0000 |
| commit | 514461b57036c83fa113ad9a8636866c98f1c7d7 (patch) | |
| tree | 4d28e7a2b9fec3ad4b5952bc90fe8d3dfd8632cb /Graphics/GraphicsEngineOpenGL | |
| parent | Renamed MAP_FLAG_DO_NOT_SYNCHRONIZE flag to MAP_FLAG_NO_OVERWRITE (API version ) (diff) | |
| download | DiligentCore-514461b57036c83fa113ad9a8636866c98f1c7d7.tar.gz DiligentCore-514461b57036c83fa113ad9a8636866c98f1c7d7.zip | |
Fixed issue with const PVoid not being the intended const void*
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
5 files changed, 5 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h index 8c1e44f2..39eab820 100644 --- a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h @@ -64,7 +64,7 @@ public: /// Queries the specific interface, see IObject::QueryInterface() for details virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; - void UpdateData(GLContextState& CtxState, Uint32 Offset, Uint32 Size, const PVoid pData); + void UpdateData(GLContextState& CtxState, Uint32 Offset, Uint32 Size, const void* pData); void CopyData(GLContextState& CtxState, BufferGLImpl& SrcBufferGL, Uint32 SrcOffset, Uint32 DstOffset, Uint32 Size); void Map(GLContextState& CtxState, MAP_TYPE MapType, Uint32 MapFlags, PVoid& pMappedData); void MapRange(GLContextState& CtxState, MAP_TYPE MapType, Uint32 MapFlags, Uint32 Offset, Uint32 Length, PVoid& pMappedData); diff --git a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h index 853ef602..899c6d68 100644 --- a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h @@ -129,7 +129,7 @@ public: virtual void UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, - const PVoid pData, + const void* pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; /// Implementation of IDeviceContext::CopyBuffer() in OpenGL backend. diff --git a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp index 81d443a7..847f6d2e 100644 --- a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp @@ -206,7 +206,7 @@ BufferGLImpl::~BufferGLImpl() IMPLEMENT_QUERY_INTERFACE(BufferGLImpl, IID_BufferGL, TBufferBase) -void BufferGLImpl::UpdateData(GLContextState& CtxState, Uint32 Offset, Uint32 Size, const PVoid pData) +void BufferGLImpl::UpdateData(GLContextState& CtxState, Uint32 Offset, Uint32 Size, const void* pData) { BufferMemoryBarrier( GL_BUFFER_UPDATE_BARRIER_BIT, // Reads or writes to buffer objects via any OpenGL API functions that allow diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp index 26dd4121..9b402e9e 100644 --- a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp @@ -1070,7 +1070,7 @@ bool DeviceContextGLImpl::UpdateCurrentGLContext() void DeviceContextGLImpl::UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, - const PVoid pData, + const void* pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) { TDeviceContextBase::UpdateBuffer(pBuffer, Offset, Size, pData, StateTransitionMode); diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp index 740e73b7..ad346f0d 100644 --- a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp @@ -437,7 +437,7 @@ void TextureBaseGL::UpdateData(GLContextState& CtxState, Uint32 MipLevel, Uint32 TextureMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT, CtxState); } -//void TextureBaseGL::UpdateData(Uint32 Offset, Uint32 Size, const PVoid pData) +//void TextureBaseGL::UpdateData(Uint32 Offset, Uint32 Size, const void* pData) //{ // CTexture::UpdateData(Offset, Size, pData); // |