[Bf-blender-cvs] [e134cff] soc-2014-viewport_context: Rename GLEW_MX -> WITH_GLEW_MX define to match similar defines

Campbell Barton noreply at git.blender.org
Sat Jul 26 22:20:50 CEST 2014 

Commit: e134cff6ae1fb57654feb9ac0091b05796e2e108
Author: Campbell Barton
Date:   Sun Jul 27 06:18:26 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rBe134cff6ae1fb57654feb9ac0091b05796e2e108

Rename GLEW_MX -> WITH_GLEW_MX define to match similar defines

Also minor edits for glew-mx docstring.

===================================================================

M	CMakeLists.txt
M	SConstruct
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
M	intern/glew-mx/intern/glew-mx.c

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1890807..b206585 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2205,7 +2205,7 @@ endif()
 # Configure GLEW
 
 if(WITH_GLEW_MX)
-	list(APPEND GL_DEFINITIONS -DGLEW_MX)
+	list(APPEND GL_DEFINITIONS -DWITH_GLEW_MX)
 endif()
 
 if(APPLE AND WITH_X11)
diff --git a/SConstruct b/SConstruct
index ca6617f..e40b887 100644
--- a/SConstruct
+++ b/SConstruct
@@ -528,7 +528,7 @@ if env['WITH_BF_GL_EGL']:
 # GLEW
 
 if env['WITH_BF_GLEW_MX']:
-    env['BF_GL_DEFINITIONS'].append('GLEW_MX')
+    env['BF_GL_DEFINITIONS'].append('WITH_GLEW_MX')
 
 if env['WITH_BF_GLEW_ES']:
     env['BF_GLEW_INC'] = '#extern/glew-es/include'
diff --git a/extern/glew-es/include/GL/eglew.h b/extern/glew-es/include/GL/eglew.h
index c4d22d0..4850654 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(GLEW_MX) && defined(_WIN32)
+#if defined(WITH_GLEW_MX) && defined(_WIN32)
  #define EGLEW_FUN_EXPORT 
  #else 
  #define EGLEW_FUN_EXPORT GLEWAPI 
- #endif /* GLEW_MX */
+ #endif /* WITH_GLEW_MX */
 
-#if defined(GLEW_MX)
+#if defined(WITH_GLEW_MX)
  #define EGLEW_VAR_EXPORT
 #else
 #define EGLEW_VAR_EXPORT GLEWAPI 
- #endif /* GLEW_MX */
+ #endif /* WITH_GLEW_MX */
 
-#if defined (GLEW_MX) && defined(_WIN32)
+#if defined (WITH_GLEW_MX) && defined(_WIN32)
 struct EGLEWContextStruct
 {
-#endif /* GLEW_MX */
+#endif /* WITH_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(GLEW_MX) && !defined(_WIN32)
+#if defined(WITH_GLEW_MX) && !defined(_WIN32)
 struct EGLEWContextStruct
 {
-#endif /* GLEW_MX */
+#endif /* WITH_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 GLEW_MX
+#ifdef WITH_GLEW_MX
 }; /* EGLEWContextStruct */
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
 /* ------------------------------------------------------------------------ */
 
-#ifdef GLEW_MX
+#ifdef WITH_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 /* GLEW_MX */
+#else /* WITH_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 /* GLEW_MX */
+#endif /* WITH_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 86bdd34..fab7583 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(GLEW_MX) && defined(_WIN32)
+#if defined(WITH_GLEW_MX) && defined(_WIN32)
 #define GLEW_FUN_EXPORT
 #else
 #define GLEW_FUN_EXPORT GLEWAPI
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
-#if defined(GLEW_MX)
+#if defined(WITH_GLEW_MX)
 #define GLEW_VAR_EXPORT
 #else
 #define GLEW_VAR_EXPORT GLEWAPI
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
-#if defined(GLEW_MX) && defined(_WIN32)
+#if defined(WITH_GLEW_MX) && defined(_WIN32)
 struct GLEWContextStruct
 {
-#endif /* GLEW_MX */
+#endif /* WITH_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(GLEW_MX) && !defined(_WIN32)
+#if defined(WITH_GLEW_MX) && !defined(_WIN32)
 struct GLEWContextStruct
 {
-#endif /* GLEW_MX */
+#endif /* WITH_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 GLEW_MX
+#ifdef WITH_GLEW_MX
 }; /* GLEWContextStruct */
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
 
 #endif /* __glesew_h__ */
diff --git a/extern/glew-es/include/GL/glew.h b/extern/glew-es/include/GL/glew.h
index 57c4086..a435618 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(GLEW_MX) && defined(_WIN32)
+#if defined(WITH_GLEW_MX) && defined(_WIN32)
 #define GLEW_FUN_EXPORT
 #else
 #define GLEW_FUN_EXPORT GLEWAPI
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
-#if defined(GLEW_MX)
+#if defined(WITH_GLEW_MX)
 #define GLEW_VAR_EXPORT
 #else
 #define GLEW_VAR_EXPORT GLEWAPI
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
-#if defined(GLEW_MX) && defined(_WIN32)
+#if defined(WITH_GLEW_MX) && defined(_WIN32)
 struct GLEWContextStruct
 {
-#endif /* GLEW_MX */
+#endif /* WITH_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(GLEW_MX) && !defined(_WIN32)
+#if defined(WITH_GLEW_MX) && !defined(_WIN32)
 struct GLEWContextStruct
 {
-#endif /* GLEW_MX */
+#endif /* WITH_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 GLEW_MX
+#ifdef WITH_GLEW_MX
 }; /* GLEWContextStruct */
-#endif /* GLEW_MX */
+#endif /* WITH_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 GLEW_MX
+#ifdef WITH_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 /* GLEW_MX */
+#else /* WITH_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 /* GLEW_MX */
+#endif /* WITH_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 a217bda..b78dea4 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 GLEW_MX
+#ifdef WITH_GLEW_MX
 #define GLXEW_EXPORT
 #else
 #define GLXEW_EXPORT extern
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
 extern PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay;
 
@@ -1542,10 +1542,10 @@ extern PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN;
 extern PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN;
 extern PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN;
 
-#if defined(GLEW_MX)
+#if defined(WITH_GLEW_MX)
 struct GLXEWContextStruct
 {
-#endif /* GLEW_MX */
+#endif /* WITH_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 GLEW_MX
+#ifdef WITH_GLEW_MX
 }; /* GLXEWContextStruct */
-#endif /* GLEW_MX */
+#endif /* WITH_GLEW_MX */
 
 /* ------------------------------------------------------------------------ */
 
-#ifdef GLEW_MX
+#ifdef WITH_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 /* GLEW_MX */
+#else /* WITH_GLEW_MX */
 
 #define GLXEW_GET_VAR(x) (*(const GLboolean*)&x)
 #define GLXEW_GET_FUN(x) x
 
 extern GLboolean glxewIsSupported (const char* name);
 
-#endif /* GLEW_MX */
+#endif /* WITH_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 311d756..f5102cf 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 GLEW_MX
+#ifdef WITH

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list