Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T51188 compilation errors in Windows

Browse Source
This commit is contained in:
Dalai Felinto
2017-04-12 18:58:38 +02:00
parent 6e4cc26265
commit 2871bad8ea
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/gpu/GPU_legacy_stubs.h
View File

@@ -47,8 +47,6 @@
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#define _GL_PREFIX static inline
/** /**
* Empty function, use for breakpoint when a depreacated * Empty function, use for breakpoint when a depreacated
* OpenGL function is called. * OpenGL function is called.
@@ -58,32 +56,32 @@ static void gl_deprecated(void)
BLI_assert(true); BLI_assert(true);
} }
#define _GL_BOOL _GL_PREFIX GLboolean #define _GL_BOOL BLI_INLINE GLboolean
#define _GL_BOOL_RET { \ #define _GL_BOOL_RET { \
gl_deprecated(); \ gl_deprecated(); \
return false; \ return false; \
} }
#define _GL_ENUM _GL_PREFIX GLenum #define _GL_ENUM BLI_INLINE GLenum
#define _GL_ENUM_RET { \ #define _GL_ENUM_RET { \
gl_deprecated(); \ gl_deprecated(); \
return 0; \ return 0; \
} }
#define _GL_INT _GL_PREFIX GLint #define _GL_INT BLI_INLINE GLint
#define _GL_INT_RET { \ #define _GL_INT_RET { \
gl_deprecated(); \ gl_deprecated(); \
return 0; \ return 0; \
} }
#define _GL_UINT _GL_PREFIX GLuint #define _GL_UINT BLI_INLINE GLuint
#define _GL_UINT_RET { \ #define _GL_UINT_RET { \
gl_deprecated(); \ gl_deprecated(); \
return 0; \ return 0; \
} }
#define _GL_VOID _GL_PREFIX void #define _GL_VOID BLI_INLINE void
#define _GL_VOID_RET { \ #define _GL_VOID_RET { \
gl_deprecated(); \ gl_deprecated(); \
} }
@@ -462,7 +460,6 @@ _GL_VOID DO_NOT_USE_glVertexPointer (GLint size, GLenum type, GLsizei stride, co
#undef _GL_UINT_RET #undef _GL_UINT_RET
#undef _GL_VOID #undef _GL_VOID
#undef _GL_VOID_RET #undef _GL_VOID_RET
#undef _GL_PREFIX
#if defined(__GNUC__) #if defined(__GNUC__)
# pragma GCC diagnostic pop # pragma GCC diagnostic pop