Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-30 20:34:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compile errors.

Browse source
This commit is contained in:
leo 2017-12-30 12:49:50 -08:00
parent 5d637b1cad
commit f3b392b4fb
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/lc_glextensions.cpp
View file

@ -116,7 +116,6 @@ PFNGLVALIDATEPROGRAMPROC lcValidateProgram;
PFNGLVERTEXATTRIBPOINTERPROC lcVertexAttribPointer; PFNGLVERTEXATTRIBPOINTERPROC lcVertexAttribPointer;
PFNGLTEXIMAGE2DMULTISAMPLEPROC lcTexImage2DMultisample; PFNGLTEXIMAGE2DMULTISAMPLEPROC lcTexImage2DMultisample;
PFNGLBLITFRAMEBUFFERPROC lcBlitFramebuffer;
#endif #endif
@ -341,7 +340,6 @@ void lcInitializeGLExtensions(const QGLContext* Context)
{ {
#ifdef LC_LOAD_GLEXTENSIONS #ifdef LC_LOAD_GLEXTENSIONS
lcTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC)Context->getProcAddress("glTexImage2DMultisample"); lcTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC)Context->getProcAddress("glTexImage2DMultisample");
lcBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)Context->getProcAddress("glBlitFramebuffer");
#endif #endif
gSupportsTexImage2DMultisample = true; gSupportsTexImage2DMultisample = true;

2
common/lc_glextensions.h
View file

@ -121,7 +121,6 @@ extern PFNGLVALIDATEPROGRAMPROC lcValidateProgram;
extern PFNGLVERTEXATTRIBPOINTERPROC lcVertexAttribPointer; extern PFNGLVERTEXATTRIBPOINTERPROC lcVertexAttribPointer;
extern PFNGLTEXIMAGE2DMULTISAMPLEPROC lcTexImage2DMultisample; extern PFNGLTEXIMAGE2DMULTISAMPLEPROC lcTexImage2DMultisample;
extern PFNGLBLITFRAMEBUFFERPROC lcBlitFramebuffer;
#define glBindBuffer lcBindBufferARB #define glBindBuffer lcBindBufferARB
#define glDeleteBuffers lcDeleteBuffersARB #define glDeleteBuffers lcDeleteBuffersARB
@ -228,6 +227,5 @@ extern PFNGLBLITFRAMEBUFFERPROC lcBlitFramebuffer;
#define glVertexAttribPointer lcVertexAttribPointer #define glVertexAttribPointer lcVertexAttribPointer
#define glTexImage2DMultisample lcTexImage2DMultisample #define glTexImage2DMultisample lcTexImage2DMultisample
#define glBlitFramebuffer lcBlitFramebuffer
#endif #endif

4
common/lc_texture.h
View file

@ -33,7 +33,11 @@ public:
{ {
mRefCount.ref(); mRefCount.ref();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0) || QT_VERSION < QT_VERSION_CHECK(5, 0, 0) )
if (mRefCount == 1) if (mRefCount == 1)
#else
if (mRefCount.load() == 1)
#endif
Load(); Load();
} }