mirror of
https://github.com/leozide/leocad
synced 2025-01-18 22:26:44 +01:00
Fixed compile errors.
This commit is contained in:
parent
5d637b1cad
commit
f3b392b4fb
3 changed files with 4 additions and 4 deletions
|
@ -116,7 +116,6 @@ PFNGLVALIDATEPROGRAMPROC lcValidateProgram;
|
|||
PFNGLVERTEXATTRIBPOINTERPROC lcVertexAttribPointer;
|
||||
|
||||
PFNGLTEXIMAGE2DMULTISAMPLEPROC lcTexImage2DMultisample;
|
||||
PFNGLBLITFRAMEBUFFERPROC lcBlitFramebuffer;
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -341,7 +340,6 @@ void lcInitializeGLExtensions(const QGLContext* Context)
|
|||
{
|
||||
#ifdef LC_LOAD_GLEXTENSIONS
|
||||
lcTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC)Context->getProcAddress("glTexImage2DMultisample");
|
||||
lcBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)Context->getProcAddress("glBlitFramebuffer");
|
||||
#endif
|
||||
|
||||
gSupportsTexImage2DMultisample = true;
|
||||
|
|
|
@ -121,7 +121,6 @@ extern PFNGLVALIDATEPROGRAMPROC lcValidateProgram;
|
|||
extern PFNGLVERTEXATTRIBPOINTERPROC lcVertexAttribPointer;
|
||||
|
||||
extern PFNGLTEXIMAGE2DMULTISAMPLEPROC lcTexImage2DMultisample;
|
||||
extern PFNGLBLITFRAMEBUFFERPROC lcBlitFramebuffer;
|
||||
|
||||
#define glBindBuffer lcBindBufferARB
|
||||
#define glDeleteBuffers lcDeleteBuffersARB
|
||||
|
@ -228,6 +227,5 @@ extern PFNGLBLITFRAMEBUFFERPROC lcBlitFramebuffer;
|
|||
#define glVertexAttribPointer lcVertexAttribPointer
|
||||
|
||||
#define glTexImage2DMultisample lcTexImage2DMultisample
|
||||
#define glBlitFramebuffer lcBlitFramebuffer
|
||||
|
||||
#endif
|
||||
|
|
|
@ -33,7 +33,11 @@ public:
|
|||
{
|
||||
mRefCount.ref();
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0) || QT_VERSION < QT_VERSION_CHECK(5, 0, 0) )
|
||||
if (mRefCount == 1)
|
||||
#else
|
||||
if (mRefCount.load() == 1)
|
||||
#endif
|
||||
Load();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue