StelOpenGL.hpp   StelOpenGL.hpp 
skipping to change at line 86 skipping to change at line 86
#define glGetAttribLocation(...) GLFUNC_(glGetAttribLocation(__VA_ARGS__ )) #define glGetAttribLocation(...) GLFUNC_(glGetAttribLocation(__VA_ARGS__ ))
#define glGetBufferParameteriv(...) GLFUNC_(glGetBufferParameteriv(__VA_ARG S__)) #define glGetBufferParameteriv(...) GLFUNC_(glGetBufferParameteriv(__VA_ARG S__))
#define glGetFramebufferAttachmentParameteriv(...) GLFUNC_(glGetFramebuffe rAttachmentParameteriv(__VA_ARGS__)) #define glGetFramebufferAttachmentParameteriv(...) GLFUNC_(glGetFramebuffe rAttachmentParameteriv(__VA_ARGS__))
#define glGetProgramiv(...) GLFUNC_(glGetProgramiv(__VA_ARGS__)) #define glGetProgramiv(...) GLFUNC_(glGetProgramiv(__VA_ARGS__))
#define glGetProgramInfoLog(...) GLFUNC_(glGetProgramInfoLog(__VA_ARGS__ )) #define glGetProgramInfoLog(...) GLFUNC_(glGetProgramInfoLog(__VA_ARGS__ ))
#define glGetRenderbufferParameteriv(...) GLFUNC_(glGetRenderbufferParame teriv(__VA_ARGS__)) #define glGetRenderbufferParameteriv(...) GLFUNC_(glGetRenderbufferParame teriv(__VA_ARGS__))
#define glGetShaderiv(...) GLFUNC_(glGetShaderiv(__VA_ARGS__)) #define glGetShaderiv(...) GLFUNC_(glGetShaderiv(__VA_ARGS__))
#define glGetShaderInfoLog(...) GLFUNC_(glGetShaderInfoLog(__VA_ARGS__) ) #define glGetShaderInfoLog(...) GLFUNC_(glGetShaderInfoLog(__VA_ARGS__) )
#define glGetShaderPrecisionFormat(...) GLFUNC_(glGetShaderPrecisionFormat( __VA_ARGS__)) #define glGetShaderPrecisionFormat(...) GLFUNC_(glGetShaderPrecisionFormat( __VA_ARGS__))
#define glGetShaderSource(...) GLFUNC_(glGetShaderSource(__VA_ARGS__)) #define glGetShaderSource(...) GLFUNC_(glGetShaderSource(__VA_ARGS__))
#if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
#define glGetString(...) GLFUNC_(glGetString(__VA_ARGS__))
#endif
#define glGetUniformfv(...) GLFUNC_(glGetUniformfv(__VA_ARGS__)) #define glGetUniformfv(...) GLFUNC_(glGetUniformfv(__VA_ARGS__))
#define glGetUniformiv(...) GLFUNC_(glGetUniformiv(__VA_ARGS__)) #define glGetUniformiv(...) GLFUNC_(glGetUniformiv(__VA_ARGS__))
#define glGetUniformLocation(...) GLFUNC_(glGetUniformLocation(__VA_ARGS_ _)) #define glGetUniformLocation(...) GLFUNC_(glGetUniformLocation(__VA_ARGS_ _))
#define glGetVertexAttribfv(...) GLFUNC_(glGetVertexAttribfv(__VA_ARGS__ )) #define glGetVertexAttribfv(...) GLFUNC_(glGetVertexAttribfv(__VA_ARGS__ ))
#define glGetVertexAttribiv(...) GLFUNC_(glGetVertexAttribiv(__VA_ARGS__ )) #define glGetVertexAttribiv(...) GLFUNC_(glGetVertexAttribiv(__VA_ARGS__ ))
#define glGetVertexAttribPointerv(...) GLFUNC_(glGetVertexAttribPointerv(_ _VA_ARGS__)) #define glGetVertexAttribPointerv(...) GLFUNC_(glGetVertexAttribPointerv(_ _VA_ARGS__))
#define glIsBuffer(...) GLFUNC_(glIsBuffer(__VA_ARGS__)) #define glIsBuffer(...) GLFUNC_(glIsBuffer(__VA_ARGS__))
#define glIsFramebuffer(...) GLFUNC_(glIsFramebuffer(__VA_ARGS__)) #define glIsFramebuffer(...) GLFUNC_(glIsFramebuffer(__VA_ARGS__))
#define glIsProgram(...) GLFUNC_(glIsProgram(__VA_ARGS__)) #define glIsProgram(...) GLFUNC_(glIsProgram(__VA_ARGS__))
#define glIsRenderbuffer(...) GLFUNC_(glIsRenderbuffer(__VA_ARGS__)) #define glIsRenderbuffer(...) GLFUNC_(glIsRenderbuffer(__VA_ARGS__))
skipping to change at line 142 skipping to change at line 139
#define glVertexAttrib1f(...) GLFUNC_(glVertexAttrib1f(__VA_ARGS__)) #define glVertexAttrib1f(...) GLFUNC_(glVertexAttrib1f(__VA_ARGS__))
#define glVertexAttrib1fv(...) GLFUNC_(glVertexAttrib1fv(__VA_ARGS__)) #define glVertexAttrib1fv(...) GLFUNC_(glVertexAttrib1fv(__VA_ARGS__))
#define glVertexAttrib2f(...) GLFUNC_(glVertexAttrib2f(__VA_ARGS__)) #define glVertexAttrib2f(...) GLFUNC_(glVertexAttrib2f(__VA_ARGS__))
#define glVertexAttrib2fv(...) GLFUNC_(glVertexAttrib2fv(__VA_ARGS__)) #define glVertexAttrib2fv(...) GLFUNC_(glVertexAttrib2fv(__VA_ARGS__))
#define glVertexAttrib3f(...) GLFUNC_(glVertexAttrib3f(__VA_ARGS__)) #define glVertexAttrib3f(...) GLFUNC_(glVertexAttrib3f(__VA_ARGS__))
#define glVertexAttrib3fv(...) GLFUNC_(glVertexAttrib3fv(__VA_ARGS__)) #define glVertexAttrib3fv(...) GLFUNC_(glVertexAttrib3fv(__VA_ARGS__))
#define glVertexAttrib4f(...) GLFUNC_(glVertexAttrib4f(__VA_ARGS__)) #define glVertexAttrib4f(...) GLFUNC_(glVertexAttrib4f(__VA_ARGS__))
#define glVertexAttrib4fv(...) GLFUNC_(glVertexAttrib4fv(__VA_ARGS__)) #define glVertexAttrib4fv(...) GLFUNC_(glVertexAttrib4fv(__VA_ARGS__))
#define glVertexAttribPointer(...) GLFUNC_(glVertexAttribPointer(__VA_ARGS __)) #define glVertexAttribPointer(...) GLFUNC_(glVertexAttribPointer(__VA_ARGS __))
#if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
#define glGetString(...) GLFUNC_(glGetString(__VA_ARGS__))
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
#define glBindTexture(...) GLFUNC_(glBindTexture(__VA_ARGS__))
#define glBlendFunc(...) GLFUNC_(glBlendFunc(__VA_ARGS__))
#define glClear(...) GLFUNC_(glClear(__VA_ARGS__))
#define glClearColor(...) GLFUNC_(glClearColor(__VA_ARGS__))
#define glCullFace(...) GLFUNC_(glCullFace(__VA_ARGS__))
#define glDeleteTextures(...) GLFUNC_(glDeleteTextures(__VA_ARGS__))
#define glDepthMask(...) GLFUNC_(glDepthMask(__VA_ARGS__))
#define glDisable(...) GLFUNC_(glDisable(__VA_ARGS__))
#define glDrawArrays(...) GLFUNC_(glDrawArrays(__VA_ARGS__))
#define glDrawElements(...) GLFUNC_(glDrawElements(__VA_ARGS__))
#define glEnable(...) GLFUNC_(glEnable(__VA_ARGS__))
#define glGenTextures(...) GLFUNC_(glGenTextures(__VA_ARGS__))
#define glGetError(...) GLFUNC_(glGetError(__VA_ARGS__))
#define glGetIntegerv(...) GLFUNC_(glGetIntegerv(__VA_ARGS__))
#define glFrontFace(...) GLFUNC_(glFrontFace(__VA_ARGS__))
#define glIsEnabled(...) GLFUNC_(glIsEnabled(__VA_ARGS__))
#define glIsTexture(...) GLFUNC_(glIsTexture(__VA_ARGS__))
#define glStencilMask(...) GLFUNC_(glStencilMask(__VA_ARGS__))
#define glTexImage2D(...) GLFUNC_(glTexImage2D(__VA_ARGS__))
#define glTexParameterf(...) GLFUNC_(glTexParameterf(__VA_ARGS__))
#define glTexParameteri(...) GLFUNC_(glTexParameteri(__VA_ARGS__))
#define glViewport(...) GLFUNC_(glViewport(__VA_ARGS__))
#endif
#ifndef NDEBUG #ifndef NDEBUG
# define GL(line) do { \ # define GL(line) do { \
line;\ line;\
if (checkGLErrors(__FILE__, __LINE__))\ if (checkGLErrors(__FILE__, __LINE__))\
exit(-1);\ exit(-1);\
} while(0) } while(0)
#else #else
# define GL(line) line # define GL(line) line
#endif #endif
// In ANGLE and other OpenGL ES systems, GL_LINE_SMOOTH is undefined.
// We can define it here to not break compilation, but must test for real O
penGL context before calling.
# ifndef GL_LINE_SMOOTH
# define GL_LINE_SMOOTH 0x0B20
# endif
const char* getGLErrorText(int code); const char* getGLErrorText(int code);
int checkGLErrors(const char *file, int line); int checkGLErrors(const char *file, int line);
// To build on arm platforms we need to re-introduce the Qt 5.4 removed
// typedefs and defines of GLdouble/GL_DOUBLE, which are not present in GLE
S
#if defined(QT_OPENGL_ES_2)
# ifndef GL_DOUBLE
# define GL_DOUBLE GL_FLOAT
# endif
# ifndef GLdouble
typedef GLfloat GLdouble;
# endif
#endif
#endif // _STELOPENGL_HPP_ #endif // _STELOPENGL_HPP_
 End of changes. 4 change blocks. 
3 lines changed or deleted 48 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/