Commit: c5fd08803bf848130abbdce93d888dcfd6694a3a Author: Jason Wilkins Date: Fri Aug 1 07:59:30 2014 -0500 Branches: soc-2014-viewport_context https://developer.blender.org/rBc5fd08803bf848130abbdce93d888dcfd6694a3a
* moving the glew symbolic constant stuff from GPU_glew.h to glew-mx * added header that catches deprecated OpenGL function names =================================================================== M intern/glew-mx/glew-mx.h A intern/glew-mx/intern/gl-deprecated.h A intern/glew-mx/intern/symbol-binding.h M source/blender/gpu/GPU_glew.h =================================================================== diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h index 297149b..5f4ccf9 100644 --- a/intern/glew-mx/glew-mx.h +++ b/intern/glew-mx/glew-mx.h @@ -28,7 +28,7 @@ /** \file glew-mx.h * \ingroup glew-mx * - * Support for GLEW Multimple rendering conteXts (MX) + * Support for GLEW Multiple rendering conteXts (MX) * Maintained as a Blender Library. * * Different rendering contexts may have different entry points @@ -79,6 +79,19 @@ extern MXContext *_mx_context; #endif +#include "intern/symbol-binding.h" + + +/* If only compiling for OpenGL 3.2 Core Profile then we should make sure + * no legacy API entries or symbolic constants are used. + */ +#ifndef MX_NO_MANGLE_DEPRECATED +# if defined(WITH_GL_PROFILE_CORE) && !defined(WITH_GL_PROFILE_COMPAT) && !defined(WITH_GL_PROFILE_ES20) +# include "intern/gl-deprecated.h" +# endif +#endif + + MXContext *mxCreateContext (void); MXContext *mxGetCurrentContext (void); void mxMakeCurrentContext(MXContext *ctx); diff --git a/intern/glew-mx/intern/gl-deprecated.h b/intern/glew-mx/intern/gl-deprecated.h new file mode 100644 index 0000000..1a23642 --- /dev/null +++ b/intern/glew-mx/intern/gl-deprecated.h @@ -0,0 +1,872 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2014 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): Jason Wilkins + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file intern/gl-deprecated.h + * \ingroup glew-mx + * Utility used to check for use of deprecated functions. + */ + +#ifndef __GL_DEPRECATED_H__ +#define __GL_DEPRECATED_H__ + +// GL Version 1.0 +#undef glAccum +#define glAccum DO_NOT_USE_glAccum +#undef glAlphaFunc +#define glAlphaFunc DO_NOT_USE_glAlphaFunc +#undef glBegin +#define glBegin DO_NOT_USE_glBegin +#undef glBitmap +#define glBitmap DO_NOT_USE_glBitmap +#undef glCallList +#define glCallList DO_NOT_USE_glCallList +#undef glCallLists +#define glCallLists DO_NOT_USE_glCallLists +#undef glClearAccum +#define glClearAccum DO_NOT_USE_glClearAccum +#undef glClearIndex +#define glClearIndex DO_NOT_USE_glClearIndex +#undef glClipPlane +#define glClipPlane DO_NOT_USE_glClipPlane +#undef glColor3b +#define glColor3b DO_NOT_USE_glColor3b +#undef glColor3bv +#define glColor3bv DO_NOT_USE_glColor3bv +#undef glColor3d +#define glColor3d DO_NOT_USE_glColor3d +#undef glColor3dv +#define glColor3dv DO_NOT_USE_glColor3dv +#undef glColor3f +#define glColor3f DO_NOT_USE_glColor3f +#undef glColor3fv +#define glColor3fv DO_NOT_USE_glColor3fv +#undef glColor3i +#define glColor3i DO_NOT_USE_glColor3i +#undef glColor3iv +#define glColor3iv DO_NOT_USE_glColor3iv +#undef glColor3s +#define glColor3s DO_NOT_USE_glColor3s +#undef glColor3sv +#define glColor3sv DO_NOT_USE_glColor3sv +#undef glColor3ub +#define glColor3ub DO_NOT_USE_glColor3ub +#undef glColor3ubv +#define glColor3ubv DO_NOT_USE_glColor3ubv +#undef glColor3ui +#define glColor3ui DO_NOT_USE_glColor3ui +#undef glColor3uiv +#define glColor3uiv DO_NOT_USE_glColor3uiv +#undef glColor3us +#define glColor3us DO_NOT_USE_glColor3us +#undef glColor3usv +#define glColor3usv DO_NOT_USE_glColor3usv +#undef glColor4b +#define glColor4b DO_NOT_USE_glColor4b +#undef glColor4bv +#define glColor4bv DO_NOT_USE_glColor4bv +#undef glColor4d +#define glColor4d DO_NOT_USE_glColor4d +#undef glColor4dv +#define glColor4dv DO_NOT_USE_glColor4dv +#undef glColor4f +#define glColor4f DO_NOT_USE_glColor4f +#undef glColor4fv +#define glColor4fv DO_NOT_USE_glColor4fv +#undef glColor4i +#define glColor4i DO_NOT_USE_glColor4i +#undef glColor4iv +#define glColor4iv DO_NOT_USE_glColor4iv +#undef glColor4s +#define glColor4s DO_NOT_USE_glColor4s +#undef glColor4sv +#define glColor4sv DO_NOT_USE_glColor4sv +#undef glColor4ub +#define glColor4ub DO_NOT_USE_glColor4ub +#undef glColor4ubv +#define glColor4ubv DO_NOT_USE_glColor4ubv +#undef glColor4ui +#define glColor4ui DO_NOT_USE_glColor4ui +#undef glColor4uiv +#define glColor4uiv DO_NOT_USE_glColor4uiv +#undef glColor4us +#define glColor4us DO_NOT_USE_glColor4us +#undef glColor4usv +#define glColor4usv DO_NOT_USE_glColor4usv +#undef glColorMaterial +#define glColorMaterial DO_NOT_USE_glColorMaterial +#undef glCopyPixels +#define glCopyPixels DO_NOT_USE_glCopyPixels +#undef glDeleteLists +#define glDeleteLists DO_NOT_USE_glDeleteLists +#undef glDrawPixels +#define glDrawPixels DO_NOT_USE_glDrawPixels +#undef glEdgeFlag +#define glEdgeFlag DO_NOT_USE_glEdgeFlag +#undef glEdgeFlagv +#define glEdgeFlagv DO_NOT_USE_glEdgeFlagv +#undef glEnd +#define glEnd DO_NOT_USE_glEnd +#undef glEndList +#define glEndList DO_NOT_USE_glEndList +#undef glEvalCoord1d +#define glEvalCoord1d DO_NOT_USE_glEvalCoord1d +#undef glEvalCoord1dv +#define glEvalCoord1dv DO_NOT_USE_glEvalCoord1dv +#undef glEvalCoord1f +#define glEvalCoord1f DO_NOT_USE_glEvalCoord1f +#undef glEvalCoord1fv +#define glEvalCoord1fv DO_NOT_USE_glEvalCoord1fv +#undef glEvalCoord2d +#define glEvalCoord2d DO_NOT_USE_glEvalCoord2d +#undef glEvalCoord2dv +#define glEvalCoord2dv DO_NOT_USE_glEvalCoord2dv +#undef glEvalCoord2f +#define glEvalCoord2f DO_NOT_USE_glEvalCoord2f +#undef glEvalCoord2fv +#define glEvalCoord2fv DO_NOT_USE_glEvalCoord2fv +#undef glEvalMesh1 +#define glEvalMesh1 DO_NOT_USE_glEvalMesh1 +#undef glEvalMesh2 +#define glEvalMesh2 DO_NOT_USE_glEvalMesh2 +#undef glEvalPoint1 +#define glEvalPoint1 DO_NOT_USE_glEvalPoint1 +#undef glEvalPoint2 +#define glEvalPoint2 DO_NOT_USE_glEvalPoint2 +#undef glFeedbackBuffer +#define glFeedbackBuffer DO_NOT_USE_glFeedbackBuffer +#undef glFogf +#define glFogf DO_NOT_USE_glFogf +#undef glFogfv +#define glFogfv DO_NOT_USE_glFogfv +#undef glFogi +#define glFogi DO_NOT_USE_glFogi +#undef glFogiv +#define glFogiv DO_NOT_USE_glFogiv +#undef glFrustum +#define glFrustum DO_NOT_USE_glFrustum +#undef glGenLists +#define glGenLists DO_NOT_USE_glGenLists +#undef glGetClipPlane +#define glGetClipPlane DO_NOT_USE_glGetClipPlane +#undef glGetLightfv +#define glGetLightfv DO_NOT_USE_glGetLightfv +#undef glGetLightiv +#define glGetLightiv DO_NOT_USE_glGetLightiv +#undef glGetMapdv +#define glGetMapdv DO_NOT_USE_glGetMapdv +#undef glGetMapfv +#define glGetMapfv DO_NOT_USE_glGetMapfv +#undef glGetMapiv +#define glGetMapiv DO_NOT_USE_glGetMapiv +#undef glGetMaterialfv +#define glGetMaterialfv DO_NOT_USE_glGetMaterialfv +#undef glGetMaterialiv +#define glGetMaterialiv DO_NOT_USE_glGetMaterialiv +#undef glGetPixelMapfv +#define glGetPixelMapfv DO_NOT_USE_glGetPixelMapfv +#undef glGetPixelMapuiv +#define glGetPixelMapuiv DO_NOT_USE_glGetPixelMapuiv +#undef glGetPixelMapusv +#define glGetPixelMapusv DO_NOT_USE_glGetPixelMapusv +#undef glGetPolygonStipple +#define glGetPolygonStipple DO_NOT_USE_glGetPolygonStipple +#undef glGetTexEnvfv +#define glGetTexEnvfv DO_NOT_USE_glGetTexEnvfv +#undef glGetTexEnviv +#define glGetTexEnviv DO_NOT_USE_glGetTexEnviv +#undef glGetTexGendv +#define glGetTexGendv DO_NOT_USE_glGetTexGendv +#undef glGetTexGenfv +#define glGetTexGenfv DO_NOT_USE_glGetTexGenfv +#undef glGetTexGeniv +#define glGetTexGeniv DO_NOT_USE_glGetTexGeniv +#undef glIndexMask +#define glIndexMask DO_NOT_USE_glIndexMask +#undef glIndexd +#define glIndexd DO_NOT_USE_glIndexd +#undef glIndexdv +#define glIndexdv DO_NOT_USE_glIndexdv +#undef glIndexf +#define glIndexf DO_NOT_USE_glIndexf +#undef glIndexfv +#define glIndexfv DO_NOT_USE_glIndexfv +#undef glIndexi +#define glIndexi DO_NOT_USE_glIndexi +#undef glIndexiv +#define glIndexiv DO_NOT_USE_glIndexiv +#undef glIndexs +#define glIndexs DO_NOT_USE_glIndexs +#undef glIndexsv +#define glIndexsv DO_NOT_USE_glIndexsv +#undef glInitNames +#define glInitNames DO_NOT_USE_glInitNames +#undef glIsList +#define glIsList DO_NOT_USE_glIsList +#undef glLightModelf +#define glLightModelf DO_NOT_USE_glLightModelf +#undef glLightModelfv +#define glLightModelfv DO_NOT_USE_glLightModelfv +#undef glLightModeli +#define glLightModeli DO_NOT_USE_glLightModeli +#undef glLightModeliv +#define glLightModeliv DO_NOT_USE_glLightModeliv +#undef glLightf +#define glLightf DO_NOT_USE_glLightf +#undef glLightfv +#define glLightfv DO_NOT_USE_glLightfv +#undef glLighti +#define glLighti DO_NOT_USE_glLighti +#undef glLightiv +#define glLightiv DO_NOT_USE_glLightiv +#undef glLineStipple +#define glLineStipple DO_NOT_USE_glLineStipple +#undef glListBase +#define glListBase DO_NOT_USE_glListBase +#undef glLoadIdentity +#define glLoadIdentity DO_NOT_USE_glLoadIdentity +#undef glLoadMatrixd +#define glLoadMatrixd DO_NOT_USE_glLoadMatrixd +#undef glLoadMatrixf +#define glLoadMatrixf DO_NOT_USE_glLoadMatrixf +#undef glLoadName +#define glLoadName DO_NOT_USE_glLoadName +#undef glMap1d +#define glMap1d DO_NOT_USE_glMap1d +#undef glMap1f +#define glMap1f DO_NOT_USE_glMap1f +#undef glMap2d +#define glMap2d DO_NOT_USE_glMap2d +#undef glMap2f +#define glMap2f DO_NOT_USE_glMap2f +#undef glMapGrid1d +#define glMapGrid1d DO_NOT_USE_glMapGrid1d +#undef glMapGrid1f +#define glMapGrid1f DO_NOT_USE_glMapGrid1f +#undef glMapGrid2d +#define glMapGrid2d DO_NOT_USE_glMapGrid2d +#undef glMapGrid2f +#define glMapGrid2f DO_NOT_USE_glMapGrid2f +#undef glMaterialf +#define glMaterialf DO_NOT_USE_glMaterialf +#undef glMaterialfv +#define glMaterialfv DO_NOT_USE_glMaterialfv +#undef glMateriali +#define glMateriali DO_NOT_USE_glMateriali +#undef glMaterialiv +#define glMaterialiv DO_NOT_USE_glMaterialiv +#undef glMatrixMode +#define glMatrixMode DO_NOT_USE_glMatrixMode +#undef glMultMatrixd +# @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
