[Bf-blender-cvs] [37d5163] soc-2014-viewport_context: revert changes to external glew-mx defines
Campbell Barton
noreply at git.blender.org
Sun Jul 27 18:51:48 CEST 2014
Commit: 37d5163d87dc0bef2a1af0508b4e9920e3cf6bb5
Author: Campbell Barton
Date: Mon Jul 28 02:50:50 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rB37d5163d87dc0bef2a1af0508b4e9920e3cf6bb5
revert changes to external glew-mx defines
===================================================================
M extern/glew-es/include/GL/eglew.h
M extern/glew-es/include/GL/glesew.h
M extern/glew-es/include/GL/glew.h
M extern/glew-es/include/GL/glxew.h
M extern/glew-es/include/GL/wglew.h
M extern/glew-es/src/glew.c
M extern/glew/include/GL/glew.h
M extern/glew/include/GL/glxew.h
M extern/glew/include/GL/wglew.h
M extern/glew/src/glew.c
M intern/glew-mx/glew-mx.h
===================================================================
diff --git a/extern/glew-es/include/GL/eglew.h b/extern/glew-es/include/GL/eglew.h
index 4850654..c4d22d0 100644
--- a/extern/glew-es/include/GL/eglew.h
+++ b/extern/glew-es/include/GL/eglew.h
@@ -1284,22 +1284,22 @@ typedef EGLuint64NV (EGLAPIENTRY * PFNEGLGETSYSTEMTIMENVPROC) (void);
/* ------------------------------------------------------------------------- */
-#if defined(WITH_GLEW_MX) && defined(_WIN32)
+#if defined(GLEW_MX) && defined(_WIN32)
#define EGLEW_FUN_EXPORT
#else
#define EGLEW_FUN_EXPORT GLEWAPI
- #endif /* WITH_GLEW_MX */
+ #endif /* GLEW_MX */
-#if defined(WITH_GLEW_MX)
+#if defined(GLEW_MX)
#define EGLEW_VAR_EXPORT
#else
#define EGLEW_VAR_EXPORT GLEWAPI
- #endif /* WITH_GLEW_MX */
+ #endif /* GLEW_MX */
-#if defined (WITH_GLEW_MX) && defined(_WIN32)
+#if defined (GLEW_MX) && defined(_WIN32)
struct EGLEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
EGLEW_FUN_EXPORT PFNCREATESYNC __eglewCreateSync;
EGLEW_FUN_EXPORT PFNDESTROYSYNC __eglewDestroySync;
@@ -1364,10 +1364,10 @@ EGLEW_FUN_EXPORT PFNEGLSIGNALSYNCNVPROC __eglewSignalSyncNV;
EGLEW_FUN_EXPORT PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC __eglewGetSystemTimeFrequencyNV;
EGLEW_FUN_EXPORT PFNEGLGETSYSTEMTIMENVPROC __eglewGetSystemTimeNV;
-#if defined(WITH_GLEW_MX) && !defined(_WIN32)
+#if defined(GLEW_MX) && !defined(_WIN32)
struct EGLEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_1;
EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_2;
@@ -1421,13 +1421,13 @@ EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_post_sub_buffer;
EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_sync;
EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_system_time;
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
}; /* EGLEWContextStruct */
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
/* ------------------------------------------------------------------------ */
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
typedef struct EGLEWContextStruct EGLEWContext;
extern GLenum eglewContextInit (EGLDisplay display, EGLEWContext* ctx);
@@ -1443,7 +1443,7 @@ extern GLboolean eglewContextIsSupported (const EGLEWContext* ctx, const char* n
# define EGLEW_GET_FUN(x) x
#endif
-#else /* WITH_GLEW_MX */
+#else /* GLEW_MX */
#define EGLEW_GET_VAR(x) (*(const GLboolean*)&x)
#define EGLEW_GET_FUN(x) x
@@ -1453,7 +1453,7 @@ extern GLenum eglewContextInit(EGLDisplay display); // XXX jwilkins: context han
extern GLboolean eglewIsSupported (const char* name);
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
extern GLboolean eglewGetExtension (const char* name);
diff --git a/extern/glew-es/include/GL/glesew.h b/extern/glew-es/include/GL/glesew.h
index fab7583..86bdd34 100644
--- a/extern/glew-es/include/GL/glesew.h
+++ b/extern/glew-es/include/GL/glesew.h
@@ -3713,22 +3713,22 @@ typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSSUNPROC) (GLenum mode, GLsizei*
/* ------------------------------------------------------------------------- */
-#if defined(WITH_GLEW_MX) && defined(_WIN32)
+#if defined(GLEW_MX) && defined(_WIN32)
#define GLEW_FUN_EXPORT
#else
#define GLEW_FUN_EXPORT GLEWAPI
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
-#if defined(WITH_GLEW_MX)
+#if defined(GLEW_MX)
#define GLEW_VAR_EXPORT
#else
#define GLEW_VAR_EXPORT GLEWAPI
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
-#if defined(WITH_GLEW_MX) && defined(_WIN32)
+#if defined(GLEW_MX) && defined(_WIN32)
struct GLEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
#if GL_ES_VERSION_1_0 // XXX jwilkins: glew doesn't actually seem to be designed to let you use the extension macros
GLEW_FUN_EXPORT PFNGLACTIVETEXTUREPROC __glewActiveTexture;
@@ -4163,10 +4163,10 @@ GLEW_FUN_EXPORT PFNGLSTARTTILINGQCOMPROC __glewStartTilingQCOM;
GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSSUNPROC __glewMultiDrawArraysSUN;
GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSSUNPROC __glewMultiDrawElementsSUN;
-#if defined(WITH_GLEW_MX) && !defined(_WIN32)
+#if defined(GLEW_MX) && !defined(_WIN32)
struct GLEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
GLEW_VAR_EXPORT GLboolean __GLEW_ES_VERSION_1_0;
GLEW_VAR_EXPORT GLboolean __GLEW_ES_VERSION_CL_1_1;
@@ -4310,9 +4310,9 @@ GLEW_VAR_EXPORT GLboolean __GLEW_SUN_multi_draw_arrays;
GLEW_VAR_EXPORT GLboolean __GLEW_VG_KHR_EGL_sync;
GLEW_VAR_EXPORT GLboolean __GLEW_VIV_shader_binary;
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
}; /* GLEWContextStruct */
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
#endif /* __glesew_h__ */
diff --git a/extern/glew-es/include/GL/glew.h b/extern/glew-es/include/GL/glew.h
index a435618..57c4086 100644
--- a/extern/glew-es/include/GL/glew.h
+++ b/extern/glew-es/include/GL/glew.h
@@ -17008,22 +17008,22 @@ typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSSUNPROC) (GLenum mode, GLsizei*
/* ------------------------------------------------------------------------- */
-#if defined(WITH_GLEW_MX) && defined(_WIN32)
+#if defined(GLEW_MX) && defined(_WIN32)
#define GLEW_FUN_EXPORT
#else
#define GLEW_FUN_EXPORT GLEWAPI
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
-#if defined(WITH_GLEW_MX)
+#if defined(GLEW_MX)
#define GLEW_VAR_EXPORT
#else
#define GLEW_VAR_EXPORT GLEWAPI
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
-#if defined(WITH_GLEW_MX) && defined(_WIN32)
+#if defined(GLEW_MX) && defined(_WIN32)
struct GLEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
GLEW_FUN_EXPORT PFNGLACCUMPROC __glewAccum;
GLEW_FUN_EXPORT PFNGLARETEXTURESRESIDENTPROC __glewAreTexturesResident;
@@ -19825,10 +19825,10 @@ GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSSUNPROC __glewMultiDrawElementsSUN;
#endif /* !(GLEW_NO_ES) */
-#if defined(WITH_GLEW_MX) && !defined(_WIN32)
+#if defined(GLEW_MX) && !defined(_WIN32)
struct GLEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1;
GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;
@@ -20439,9 +20439,9 @@ GLEW_VAR_EXPORT GLboolean __GLEW_VIV_shader_binary;
#endif /* !(GLEW_NO_ES) */
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
}; /* GLEWContextStruct */
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
#endif /* GLEW_ES_ONLY */
@@ -20465,7 +20465,7 @@ GLEW_VAR_EXPORT GLboolean __GLEW_VIV_shader_binary;
#define GLEW_VERSION_MICRO 4
/* API */
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
typedef struct GLEWContextStruct GLEWContext;
GLEWAPI GLenum glewContextInit (GLEWContext* ctx);
@@ -20482,7 +20482,7 @@ GLEWAPI GLboolean glewContextIsSupported (const GLEWContext* ctx, const char* na
# define GLEW_GET_FUN(x) x
#endif
-#else /* WITH_GLEW_MX */
+#else /* GLEW_MX */
GLEWAPI GLenum glewInit ();
GLEWAPI GLboolean glewIsSupported (const char* name);
@@ -20491,7 +20491,7 @@ GLEWAPI GLboolean glewIsSupported (const char* name);
#define GLEW_GET_VAR(x) (*(const GLboolean*)&x)
#define GLEW_GET_FUN(x) x
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
GLEWAPI GLboolean glewExperimental;
GLEWAPI GLboolean glewGetExtension (const char* name);
diff --git a/extern/glew-es/include/GL/glxew.h b/extern/glew-es/include/GL/glxew.h
index b78dea4..a217bda 100644
--- a/extern/glew-es/include/GL/glxew.h
+++ b/extern/glew-es/include/GL/glxew.h
@@ -1405,11 +1405,11 @@ typedef int ( * PFNGLXVIDEORESIZESUNPROC) (Display* display, GLXDrawable window,
/* ------------------------------------------------------------------------- */
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
#define GLXEW_EXPORT
#else
#define GLXEW_EXPORT extern
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
extern PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay;
@@ -1542,10 +1542,10 @@ extern PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN;
extern PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN;
extern PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN;
-#if defined(WITH_GLEW_MX)
+#if defined(GLEW_MX)
struct GLXEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_0;
GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_1;
@@ -1613,13 +1613,13 @@ GLXEW_EXPORT GLboolean __GLXEW_SGI_video_sync;
GLXEW_EXPORT GLboolean __GLXEW_SUN_get_transparent_index;
GLXEW_EXPORT GLboolean __GLXEW_SUN_video_resize;
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
}; /* GLXEWContextStruct */
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
/* ------------------------------------------------------------------------ */
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
typedef struct GLXEWContextStruct GLXEWContext;
extern GLenum glxewContextInit (GLXEWContext* ctx);
@@ -1631,14 +1631,14 @@ extern GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* n
#define GLXEW_GET_VAR(x) (*(const GLboolean*)&(glxewGetContext()->x))
#define GLXEW_GET_FUN(x) x
-#else /* WITH_GLEW_MX */
+#else /* GLEW_MX */
#define GLXEW_GET_VAR(x) (*(const GLboolean*)&x)
#define GLXEW_GET_FUN(x) x
extern GLboolean glxewIsSupported (const char* name);
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
extern GLboolean glxewGetExtension (const char* name);
diff --git a/extern/glew-es/include/GL/wglew.h b/extern/glew-es/include/GL/wglew.h
index f5102cf..311d756 100644
--- a/extern/glew-es/include/GL/wglew.h
+++ b/extern/glew-es/include/GL/wglew.h
@@ -1172,16 +1172,16 @@ typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT6
/* ------------------------------------------------------------------------- */
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
#define WGLEW_EXPORT
#else
#define WGLEW_EXPORT GLEWAPI
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
struct WGLEWContextStruct
{
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
WGLEW_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL;
@@ -1383,13 +1383,13 @@ WGLEW_EXPORT GLboolean __WGLEW_NV_video_capture;
WGLEW_EXPORT GLboolean __WGLEW_NV_video_output;
WGLEW_EXPORT GLboolean __WGLEW_OML_sync_control;
-#ifdef WITH_GLEW_MX
+#ifdef GLEW_MX
}; /* WGLEWContextStruct */
-#endif /* WITH_GLEW_MX */
+#endif /* GLEW_MX */
/* ---------------------------------------------------------
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list