blender
/
blender
131
398
Fork 577
Code Issues 6.3k Pull Requests 738 Projects 19 Wiki Activity

Fix define issues w/ WITH_GL_PROFILE_COMPAT off 

This still fails to build, but at least fail where its supposed to (using unsupported API's).
This commit is contained in:
Campbell Barton 2015-07-20 13:08:26 +10:00
parent cd91fd655d
commit b368724464
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/include/BIF_gl.h
View File

@ -47,6 +47,7 @@
* */
void cpack(unsigned int x);
#ifdef WITH_GL_PROFILE_COMPAT
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
# define glMultMatrixf(x) \
glMultMatrixf(_Generic((x), \
@ -66,15 +67,21 @@ void cpack(unsigned int x);
float (*)[4]: (float *)(x), \
float [4][4]: (float *)(x)) \
)
/* hacking pointsize and linewidth */
#define glPointSize(f) glPointSize(U.pixelsize * _Generic((f), double: (float)(f), default: (f)))
#define glLineWidth(f) glLineWidth(U.pixelsize * _Generic((f), double: (float)(f), default: (f)))
#else
# define glMultMatrixf(x) glMultMatrixf((float *)(x))
# define glLoadMatrixf(x) glLoadMatrixf((float *)(x))
#define glPointSize(f) glPointSize(U.pixelsize * (f))
#define glLineWidth(f) glLineWidth(U.pixelsize * (f))
#endif
#endif /* C11 */
#endif /* WITH_GL_PROFILE_COMPAT */
/* hacking pointsize and linewidth */
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
# define glPointSize(f) glPointSize(U.pixelsize * _Generic((f), double: (float)(f), default: (f)))
# define glLineWidth(f) glLineWidth(U.pixelsize * _Generic((f), double: (float)(f), default: (f)))
#else
# define glPointSize(f) glPointSize(U.pixelsize * (f))
# define glLineWidth(f) glLineWidth(U.pixelsize * (f))
#endif /* C11 */
#define GLA_PIXEL_OFS 0.375f