diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-30 13:44:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-11 10:47:10 +0000 |
| commit | 38abd329222ca26b6b66ce8acc3d8a2693562a1f (patch) | |
| tree | 528049392fc2b896a1288985da6263742a7fdc96 | |
| parent | 858684b9a3851721bd5b2511df7c18f054d79511 (diff) | |
| download | qt3d-38abd329222ca26b6b66ce8acc3d8a2693562a1f.tar.gz | |
Resolve duplicate symbol error for `memoryBarrierGLBitfield`
I slightly modified the function name to avoid the collision during the
unity build.
Task-number: QTBUG-109394
Change-Id: I1f1ffedc4ecb277a377569b47ee24d4657ceebe5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2bd0f6344008626ae3971d6cc1a0e875c18c11c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp index bda79dc3a..d82403d7b 100644 --- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp +++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp @@ -118,7 +118,7 @@ namespace OpenGL { namespace { -GLbitfield memoryBarrierGLBitfield(QMemoryBarrier::Operations barriers) +GLbitfield memoryBarrierGL3Bitfield(QMemoryBarrier::Operations barriers) { GLbitfield bits = 0; @@ -204,7 +204,7 @@ void GraphicsHelperES3_1::dispatchCompute(GLuint wx, GLuint wy, GLuint wz) void GraphicsHelperES3_1::memoryBarrier(QMemoryBarrier::Operations barriers) { - m_extraFuncs->glMemoryBarrier(memoryBarrierGLBitfield(barriers)); + m_extraFuncs->glMemoryBarrier(memoryBarrierGL3Bitfield(barriers)); } void GraphicsHelperES3_1::drawArraysIndirect(GLenum mode, void *indirect) diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp index 706923298..c2dff740c 100644 --- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp +++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp @@ -85,7 +85,7 @@ namespace OpenGL { namespace { -GLbitfield memoryBarrierGLBitfield(QMemoryBarrier::Operations barriers) +GLbitfield memoryBarrierGL4Bitfield(QMemoryBarrier::Operations barriers) { GLbitfield bits = 0; @@ -1306,7 +1306,7 @@ GLint GraphicsHelperGL4::maxClipPlaneCount() void GraphicsHelperGL4::memoryBarrier(QMemoryBarrier::Operations barriers) { - m_funcs->glMemoryBarrier(memoryBarrierGLBitfield(barriers)); + m_funcs->glMemoryBarrier(memoryBarrierGL4Bitfield(barriers)); } void GraphicsHelperGL4::enablePrimitiveRestart(int primitiveRestartIndex) |