Skip to content

Commit

Permalink
Bring glgen into line with OpenGL functions and extensions code
Browse files Browse the repository at this point in the history 
This ensures that glgen outputs exactly what is included in

src/gui/opengl/qopenglversionfunctions.*
src/gui/opengl/qopenglfunctions_*
src/openglextensions/*

Change-Id: I7d41d9fc2bf6e5fedf11f58872c079339dac3649
Reviewed-by: James Turner <[email protected]>
Reviewed-by: Samuel Rødal <[email protected]>
  • Loading branch information
@seanharmer
seanharmer authored and The Qt Project committed Apr 4, 2013
1 parent 8d92244 commit f46787b
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 149 deletions.
60 changes: 30 additions & 30 deletions util/glgen/qopenglextensions.h.footer
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public:
void (QOPENGLF_APIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLeglImageOES image);
};

class Q_GUI_EXPORT QOpenGLExtension_OES_EGL_image : public QAbstractOpenGLExtension
class QOpenGLExtension_OES_EGL_image : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_OES_EGL_image();
Expand Down Expand Up @@ -41,7 +41,7 @@ public:
void (QOPENGLF_APIENTRYP ProgramBinaryOES)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length);
};

class Q_GUI_EXPORT QOpenGLExtension_OES_get_program_binary : public QAbstractOpenGLExtension
class QOpenGLExtension_OES_get_program_binary : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_OES_get_program_binary();
Expand Down Expand Up @@ -75,7 +75,7 @@ public:
void (QOPENGLF_APIENTRYP GetBufferPointervOES)(GLenum target, GLenum pname, GLvoid** params);
};

class Q_GUI_EXPORT QOpenGLExtension_OES_mapbuffer : public QAbstractOpenGLExtension
class QOpenGLExtension_OES_mapbuffer : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_OES_mapbuffer();
Expand Down Expand Up @@ -119,7 +119,7 @@ public:
void (QOPENGLF_APIENTRYP FramebufferTexture3DOES)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
};

class Q_GUI_EXPORT QOpenGLExtension_OES_texture_3D : public QAbstractOpenGLExtension
class QOpenGLExtension_OES_texture_3D : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_OES_texture_3D();
Expand Down Expand Up @@ -182,7 +182,7 @@ public:
GLboolean (QOPENGLF_APIENTRYP IsVertexArrayOES)(GLuint array);
};

class Q_GUI_EXPORT QOpenGLExtension_OES_vertex_array_object : public QAbstractOpenGLExtension
class QOpenGLExtension_OES_vertex_array_object : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_OES_vertex_array_object();
Expand Down Expand Up @@ -238,7 +238,7 @@ public:
void (QOPENGLF_APIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
};

class Q_GUI_EXPORT QOpenGLExtension_AMD_performance_monitor : public QAbstractOpenGLExtension
class QOpenGLExtension_AMD_performance_monitor : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_AMD_performance_monitor();
Expand Down Expand Up @@ -333,7 +333,7 @@ public:
void (QOPENGLF_APIENTRYP BlitFramebufferANGLE)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
};

class Q_GUI_EXPORT QOpenGLExtension_ANGLE_framebuffer_blit : public QAbstractOpenGLExtension
class QOpenGLExtension_ANGLE_framebuffer_blit : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_ANGLE_framebuffer_blit();
Expand All @@ -358,7 +358,7 @@ public:
void (QOPENGLF_APIENTRYP RenderbufferStorageMultisampleANGLE)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
};

class Q_GUI_EXPORT QOpenGLExtension_ANGLE_framebuffer_multisample : public QAbstractOpenGLExtension
class QOpenGLExtension_ANGLE_framebuffer_multisample : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_ANGLE_framebuffer_multisample();
Expand All @@ -385,7 +385,7 @@ public:
void (QOPENGLF_APIENTRYP VertexAttribDivisorANGLE)(GLuint index, GLuint divisor);
};

class Q_GUI_EXPORT QOpenGLExtension_ANGLE_instanced_arrays : public QAbstractOpenGLExtension
class QOpenGLExtension_ANGLE_instanced_arrays : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_ANGLE_instanced_arrays();
Expand Down Expand Up @@ -424,7 +424,7 @@ public:
void (QOPENGLF_APIENTRYP GetTranslatedShaderSourceANGLE)(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
};

class Q_GUI_EXPORT QOpenGLExtension_ANGLE_translated_shader_source : public QAbstractOpenGLExtension
class QOpenGLExtension_ANGLE_translated_shader_source : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_ANGLE_translated_shader_source();
Expand All @@ -450,7 +450,7 @@ public:
void (QOPENGLF_APIENTRYP ResolveMultisampleFramebufferAPPLE)(void);
};

class Q_GUI_EXPORT QOpenGLExtension_APPLE_framebuffer_multisample : public QAbstractOpenGLExtension
class QOpenGLExtension_APPLE_framebuffer_multisample : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_APPLE_framebuffer_multisample();
Expand Down Expand Up @@ -483,7 +483,7 @@ public:
void (QOPENGLF_APIENTRYP GetObjectLabelEXT)(GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_debug_label : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_debug_label : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_debug_label();
Expand Down Expand Up @@ -517,7 +517,7 @@ public:
void (QOPENGLF_APIENTRYP PopGroupMarkerEXT)(void);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_debug_marker : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_debug_marker : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_debug_marker();
Expand Down Expand Up @@ -556,7 +556,7 @@ public:
void (QOPENGLF_APIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum *attachments);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_discard_framebuffer : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_discard_framebuffer : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_discard_framebuffer();
Expand All @@ -582,7 +582,7 @@ public:
void (QOPENGLF_APIENTRYP FramebufferTexture2DMultisampleEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_multisampled_render_to_texture : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_multisampled_render_to_texture : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_multisampled_render_to_texture();
Expand Down Expand Up @@ -615,7 +615,7 @@ public:
void (QOPENGLF_APIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_multi_draw_arrays : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_multi_draw_arrays : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_multi_draw_arrays();
Expand Down Expand Up @@ -653,7 +653,7 @@ public:
void (QOPENGLF_APIENTRYP GetQueryObjectuivEXT)(GLuint id, GLenum pname, GLuint *params);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_occlusion_query_boolean : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_occlusion_query_boolean : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_occlusion_query_boolean();
Expand Down Expand Up @@ -723,7 +723,7 @@ public:
void (QOPENGLF_APIENTRYP GetnUniformivEXT)(GLuint program, GLint location, GLsizei bufSize, GLint *params);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_robustness : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_robustness : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_robustness();
Expand Down Expand Up @@ -798,7 +798,7 @@ public:
void (QOPENGLF_APIENTRYP GetProgramPipelineInfoLogEXT)(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_separate_shader_objects : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_separate_shader_objects : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_separate_shader_objects();
Expand Down Expand Up @@ -1031,7 +1031,7 @@ public:
void (QOPENGLF_APIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
};

class Q_GUI_EXPORT QOpenGLExtension_EXT_texture_storage : public QAbstractOpenGLExtension
class QOpenGLExtension_EXT_texture_storage : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_EXT_texture_storage();
Expand Down Expand Up @@ -1092,7 +1092,7 @@ public:
void (QOPENGLF_APIENTRYP FramebufferTexture2DMultisampleIMG)(GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
};

class Q_GUI_EXPORT QOpenGLExtension_IMG_multisampled_render_to_texture : public QAbstractOpenGLExtension
class QOpenGLExtension_IMG_multisampled_render_to_texture : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_IMG_multisampled_render_to_texture();
Expand Down Expand Up @@ -1125,7 +1125,7 @@ public:
void (QOPENGLF_APIENTRYP CoverageOperationNV)(GLenum operation);
};

class Q_GUI_EXPORT QOpenGLExtension_NV_coverage_sample : public QAbstractOpenGLExtension
class QOpenGLExtension_NV_coverage_sample : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_NV_coverage_sample();
Expand Down Expand Up @@ -1157,7 +1157,7 @@ public:
void (QOPENGLF_APIENTRYP DrawBuffersNV)(GLsizei n, const GLenum *bufs);
};

class Q_GUI_EXPORT QOpenGLExtension_NV_draw_buffers : public QAbstractOpenGLExtension
class QOpenGLExtension_NV_draw_buffers : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_NV_draw_buffers();
Expand Down Expand Up @@ -1188,7 +1188,7 @@ public:
void (QOPENGLF_APIENTRYP SetFenceNV)(GLuint fence, GLenum condition);
};

class Q_GUI_EXPORT QOpenGLExtension_NV_fence : public QAbstractOpenGLExtension
class QOpenGLExtension_NV_fence : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_NV_fence();
Expand Down Expand Up @@ -1255,7 +1255,7 @@ public:
void (QOPENGLF_APIENTRYP ReadBufferNV)(GLenum mode);
};

class Q_GUI_EXPORT QOpenGLExtension_NV_read_buffer : public QAbstractOpenGLExtension
class QOpenGLExtension_NV_read_buffer : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_NV_read_buffer();
Expand All @@ -1280,7 +1280,7 @@ public:
void (QOPENGLF_APIENTRYP AlphaFuncQCOM)(GLenum func, GLclampf ref);
};

class Q_GUI_EXPORT QOpenGLExtension_QCOM_alpha_test : public QAbstractOpenGLExtension
class QOpenGLExtension_QCOM_alpha_test : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_QCOM_alpha_test();
Expand Down Expand Up @@ -1308,7 +1308,7 @@ public:
void (QOPENGLF_APIENTRYP DisableDriverControlQCOM)(GLuint driverControl);
};

class Q_GUI_EXPORT QOpenGLExtension_QCOM_driver_control : public QAbstractOpenGLExtension
class QOpenGLExtension_QCOM_driver_control : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_QCOM_driver_control();
Expand Down Expand Up @@ -1361,7 +1361,7 @@ public:
void (QOPENGLF_APIENTRYP ExtGetBufferPointervQCOM)(GLenum target, GLvoid **params);
};

class Q_GUI_EXPORT QOpenGLExtension_QCOM_extended_get : public QAbstractOpenGLExtension
class QOpenGLExtension_QCOM_extended_get : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_QCOM_extended_get();
Expand Down Expand Up @@ -1438,7 +1438,7 @@ public:
void (QOPENGLF_APIENTRYP ExtGetProgramBinarySourceQCOM)(GLuint program, GLenum shadertype, GLchar *source, GLint *length);
};

class Q_GUI_EXPORT QOpenGLExtension_QCOM_extended_get2 : public QAbstractOpenGLExtension
class QOpenGLExtension_QCOM_extended_get2 : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_QCOM_extended_get2();
Expand Down Expand Up @@ -1485,7 +1485,7 @@ public:
void (QOPENGLF_APIENTRYP EndTilingQCOM)(GLbitfield preserveMask);
};

class Q_GUI_EXPORT QOpenGLExtension_QCOM_tiled_rendering : public QAbstractOpenGLExtension
class QOpenGLExtension_QCOM_tiled_rendering : public QAbstractOpenGLExtension
{
public:
QOpenGLExtension_QCOM_tiled_rendering();
Expand Down
Loading

0 comments on commit f46787b

Please sign in to comment.