[Bf-blender-cvs] [88fe896] master: Checked each of my (jwilkins) XXX notes.
Jason Wilkins
noreply at git.blender.org
Thu Oct 23 03:03:45 CEST 2014
Commit: 88fe8962434b7fe00fa713a84c58d2dbee481e3b
Author: Jason Wilkins
Date: Wed Oct 22 20:03:25 2014 -0500
Branches: master
https://developer.blender.org/rB88fe8962434b7fe00fa713a84c58d2dbee481e3b
Checked each of my (jwilkins) XXX notes.
The ones in extern/glew-es have been changed to NOTE instead of XXX
GHOST_ContextEGL.cpp: It really does seem that it is not possible to query the swap interval using EGL
GHOST_WidnowCocoa.h: The comment referring to Carbon is clearly out of date, so I removed it.
math_geom.c: The node about not using tmax again is correct, but the code is kept for a future maintainer who will need to know how to compute it if they modify that code.
paint_image_proj.c (2698): The question about integer truncation does not appear to have been resolved. It still seems to be an incorrectly implementation of rounding (I'd suggest using the round function instead of this hack).
===================================================================
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/wglew.h
M extern/glew-es/src/glew.c
M intern/ghost/intern/GHOST_ContextEGL.cpp
M intern/ghost/intern/GHOST_WindowCocoa.h
M source/blender/blenlib/intern/math_geom.c
===================================================================
diff --git a/extern/glew-es/include/GL/eglew.h b/extern/glew-es/include/GL/eglew.h
index 14d4dc4..e1eb1be 100644
--- a/extern/glew-es/include/GL/eglew.h
+++ b/extern/glew-es/include/GL/eglew.h
@@ -594,9 +594,9 @@ typedef EGLBoolean (EGLAPIENTRY * PFNWAITSYNC ) (EGLDisplay dp
#if !defined(EGL_ANDROID_blob_cache)
#define EGL_ANDROID_blob_cache 1
-typedef khronos_ssize_t EGLsizeiANDROID; // XXX jwilkins: missing typedef
-typedef EGLsizeiANDROID (*EGLGetBlobFuncANDROID) (const void* key, EGLsizeiANDROID keySize, void* value, EGLsizeiANDROID valueSize); // XXX jwilkins: missing typedef
-typedef void (*EGLSetBlobFuncANDROID) (const void* key, EGLsizeiANDROID keySize, const void* value, EGLsizeiANDROID valueSize); // XXX jwilkins: missing typedef
+typedef khronos_ssize_t EGLsizeiANDROID; // NOTE jwilkins: missing typedef
+typedef EGLsizeiANDROID (*EGLGetBlobFuncANDROID) (const void* key, EGLsizeiANDROID keySize, void* value, EGLsizeiANDROID valueSize); // NOTE jwilkins: missing typedef
+typedef void (*EGLSetBlobFuncANDROID) (const void* key, EGLsizeiANDROID keySize, const void* value, EGLsizeiANDROID valueSize); // NOTE jwilkins: missing typedef
typedef void (EGLAPIENTRY * PFNEGLSETBLOBCACHEFUNCSANDROIDPROC) (EGLDisplay dpy, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
@@ -633,7 +633,7 @@ typedef void (EGLAPIENTRY * PFNEGLSETBLOBCACHEFUNCSANDROIDPROC) (EGLDisplay dpy,
#if !defined(EGL_ANDROID_native_fence_sync)
#define EGL_ANDROID_native_fence_sync 1
-typedef void* EGLSyncKHR; // XXX jwilkins: missing typedef
+typedef void* EGLSyncKHR; // NOTE jwilkins: missing typedef
#define EGL_SYNC_NATIVE_FENCE_ANDROID 0x3144
#define EGL_SYNC_NATIVE_FENCE_FD_ANDROID 0x3145
@@ -1013,7 +1013,7 @@ typedef EGLBoolean (EGLAPIENTRY * PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLS
#define EGL_CONSUMER_ACQUIRE_TIMEOUT_USEC_KHR 0x321E
-typedef void* EGLStreamKHR; // XXX jwilkins: missing typedef
+typedef void* EGLStreamKHR; // NOTE jwilkins: missing typedef
typedef EGLBoolean (EGLAPIENTRY * PFNEGLSTREAMCONSUMERACQUIREKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
typedef EGLBoolean (EGLAPIENTRY * PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
@@ -1032,7 +1032,7 @@ typedef EGLBoolean (EGLAPIENTRY * PFNEGLSTREAMCONSUMERRELEASEKHRPROC) (EGLDispla
#if !defined(EGL_KHR_stream_cross_process_fd)
#define EGL_KHR_stream_cross_process_fd 1
-typedef int EGLNativeFileDescriptorKHR; // XXX jwilkins: missing typedef
+typedef int EGLNativeFileDescriptorKHR; // NOTE jwilkins: missing typedef
typedef EGLStreamKHR (EGLAPIENTRY * PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor);
typedef EGLNativeFileDescriptorKHR (EGLAPIENTRY * PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
@@ -1107,7 +1107,7 @@ typedef EGLSurface (EGLAPIENTRY * PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC) (EGL
#if !defined(EGL_KHR_wait_sync)
#define EGL_KHR_wait_sync 1
-typedef void* EGLSyncKHR; // XXX jwilkins: missing typedef
+typedef void* EGLSyncKHR; // NOTE jwilkins: missing typedef
typedef EGLint (EGLAPIENTRY * PFNEGLWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);
@@ -1452,8 +1452,8 @@ extern GLboolean eglewContextIsSupported (const EGLEWContext* ctx, const char* n
#define EGLEW_GET_VAR(x) (*(const GLboolean*)&x)
#define EGLEW_GET_FUN(x) x
-extern GLenum eglewContextInit(EGLDisplay display); // XXX jwilkins: context handling not really written yet?
-#define eglewInit eglewContextInit // XXX jwilkins: context handling not really written yet?
+extern GLenum eglewContextInit(EGLDisplay display); // NOTE jwilkins: context handling not really written yet?
+#define eglewInit eglewContextInit // NOTE jwilkins: context handling not really written yet?
extern GLboolean eglewIsSupported (const char* name);
diff --git a/extern/glew-es/include/GL/glesew.h b/extern/glew-es/include/GL/glesew.h
index 86bdd34..0cb8c0d 100644
--- a/extern/glew-es/include/GL/glesew.h
+++ b/extern/glew-es/include/GL/glesew.h
@@ -64,22 +64,22 @@
#error glesew.h included instead of glew.h
#endif
-// XXX jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
+// NOTE jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
#ifndef GL_ES_VERSION_1_0 // XXX
#define GL_ES_VERSION_1_0 1 // XXX
#endif // XXX
-// XXX jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
+// NOTE jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
#ifndef GL_ES_VERSION_CL_1_1 // XXX
#define GL_ES_VERSION_CL_1_1 1 // XXX
#endif // XXX
-// XXX jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
+// NOTE jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
#ifndef GL_ES_VERSION_CM_1_1 // XXX
#define GL_ES_VERSION_CM_1_1 1 // XXX
#endif // XXX
-// XXX jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
+// NOTE jwilkins: changing versions from 'ifdef' to 'if' requires setting defaults
#ifndef GL_ES_VERSION_2_0 // XXX
#define GL_ES_VERSION_2_0 1 // XXX
#endif // XXX
@@ -108,7 +108,7 @@ typedef int GLclampx;
/* Internal convenience typedefs */
typedef void (*_GLfuncptr)();
-// XXX jwilkins: had to add these
+// NOTE jwilkins: had to add these
#if defined(_MSC_VER) && _MSC_VER < 1400
typedef __int64 GLint64EXT;
typedef unsigned __int64 GLuint64EXT;
@@ -528,7 +528,7 @@ typedef struct __GLsync *GLsync;
/*************************************************************/
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glAlphaFunc (GLenum func, GLclampf ref);
#endif // XXX
GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture);
@@ -536,11 +536,11 @@ GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
GLAPI void GLAPIENTRY glClear (GLbitfield mask);
GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
GLAPI void GLAPIENTRY glClearStencil (GLint s);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
#endif
GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
#endif
GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
@@ -550,18 +550,18 @@ GLAPI void GLAPIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
GLAPI void GLAPIENTRY glDepthFunc (GLenum func);
GLAPI void GLAPIENTRY glDepthMask (GLboolean flag);
GLAPI void GLAPIENTRY glDisable (GLenum cap);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glDisableClientState (GLenum array);
#endif
GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
GLAPI void GLAPIENTRY glEnable (GLenum cap);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glEnableClientState (GLenum array);
#endif
GLAPI void GLAPIENTRY glFinish (void);
GLAPI void GLAPIENTRY glFlush (void);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glFogf (GLenum pname, GLfloat param);
GLAPI void GLAPIENTRY glFogfv (GLenum pname, const GLfloat *params);
#endif
@@ -571,14 +571,14 @@ GLAPI GLenum GLAPIENTRY glGetError (void);
GLAPI void GLAPIENTRY glGetIntegerv (GLenum pname, GLint *params);
GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name);
GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glLightModelf (GLenum pname, GLfloat param);
GLAPI void GLAPIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
GLAPI void GLAPIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
GLAPI void GLAPIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
#endif
GLAPI void GLAPIENTRY glLineWidth (GLfloat width);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glLoadIdentity (void);
GLAPI void GLAPIENTRY glLoadMatrixf (const GLfloat *m);
GLAPI void GLAPIENTRY glLogicOp (GLenum opcode);
@@ -591,27 +591,27 @@ GLAPI void GLAPIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
#endif
GLAPI void GLAPIENTRY glPixelStorei (GLenum pname, GLint param);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glPointSize (GLfloat size);
#endif // XXX
GLAPI void GLAPIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all versions of ES
GLAPI void GLAPIENTRY glPopMatrix (void);
GLAPI void GLAPIENTRY glPushMatrix (void);
#endif
GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-#if !GL_ES_VERSION_2_0 // XXX jwilkins: not in all versions of ES
+#if !GL_ES_VERSION_2_0 // NOTE jwilkins: not in all ver
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list