Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/demos/boxes/glextensions.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4747/*
    4848Functions resolved:
    49 
    50 glCreateShaderObjectARB
    51 glShaderSourceARB
    52 glCompileShaderARB
    53 glGetObjectParameterivARB
    54 glDeleteObjectARB
    55 glGetInfoLogARB
    56 glCreateProgramObjectARB
    57 glAttachObjectARB
    58 glDetachObjectARB
    59 glLinkProgramARB
    60 glUseProgramObjectARB
    61 glGetUniformLocationARB
    62 glUniform1iARB
    63 glUniform1fARB
    64 glUniform4fARB
    65 glUniformMatrix4fvARB
    6649
    6750glGenFramebuffersEXT
    … …  
    121104#endif
    122105
     106#ifndef GL_ARB_vertex_buffer_object
     107typedef ptrdiff_t GLsizeiptrARB;
     108#endif
     109
    123110#ifndef GL_VERSION_1_5
    124 typedef ptrdiff_t GLsizeiptr;
    125111#define GL_ARRAY_BUFFER 0x8892
    126112#define GL_ELEMENT_ARRAY_BUFFER 0x8893
    … …  
    136122#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
    137123#endif
    138 
    139 #ifndef GL_ARB_vertex_shader
    140 #define GL_VERTEX_SHADER_ARB 0x8B31
    141 #endif
    142 
    143 #ifndef GL_ARB_fragment_shader
    144 #define GL_FRAGMENT_SHADER_ARB 0x8B30
    145 #endif
    146 
    147 #ifndef GL_ARB_shader_objects
    148 typedef char GLcharARB;
    149 typedef unsigned int GLhandleARB;
    150 #define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
    151 #define GL_OBJECT_LINK_STATUS_ARB 0x8B82
    152 #define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
    153 #endif
    154 
    155 typedef GLhandleARB (APIENTRY *_glCreateShaderObjectARB) (GLenum);
    156 typedef void (APIENTRY *_glShaderSourceARB) (GLhandleARB, GLuint, const GLcharARB**, GLint *);
    157 typedef void (APIENTRY *_glCompileShaderARB) (GLhandleARB);
    158 typedef void (APIENTRY *_glGetObjectParameterivARB) (GLhandleARB, GLenum, int *);
    159 typedef void (APIENTRY *_glDeleteObjectARB) (GLhandleARB);
    160 typedef void (APIENTRY *_glGetInfoLogARB) (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
    161 typedef GLhandleARB (APIENTRY *_glCreateProgramObjectARB) ();
    162 typedef void (APIENTRY *_glAttachObjectARB) (GLhandleARB, GLhandleARB);
    163 typedef void (APIENTRY *_glDetachObjectARB) (GLhandleARB, GLhandleARB);
    164 typedef void (APIENTRY *_glLinkProgramARB) (GLhandleARB);
    165 typedef void (APIENTRY *_glUseProgramObjectARB) (GLhandleARB);
    166 typedef GLint (APIENTRY *_glGetUniformLocationARB) (GLhandleARB, const GLcharARB *);
    167 typedef void (APIENTRY *_glUniform1iARB) (GLint, GLint);
    168 typedef void (APIENTRY *_glUniform1fARB) (GLint, GLfloat);
    169 typedef void (APIENTRY *_glUniform4fARB) (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
    170 typedef void (APIENTRY *_glUniformMatrix4fvARB) (GLint, GLuint, GLboolean, const GLfloat *);
    171124
    172125typedef void (APIENTRY *_glGenFramebuffersEXT) (GLsizei, GLuint *);
    … …  
    186139typedef void (APIENTRY *_glGenBuffers) (GLsizei, GLuint *);
    187140typedef void (APIENTRY *_glBindBuffer) (GLenum, GLuint);
    188 typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptr, const GLvoid *, GLenum);
     141typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
    189142typedef void (APIENTRY *_glDeleteBuffers) (GLsizei, const GLuint *);
    190143typedef void *(APIENTRY *_glMapBuffer) (GLenum, GLenum);
    … …  
    195148        bool resolve(const QGLContext *context);
    196149
    197     bool glslSupported();
    198150    bool fboSupported();
    199151    bool openGL15Supported(); // the rest: multi-texture, 3D-texture, vertex buffer objects
    200 
    201         _glCreateShaderObjectARB CreateShaderObjectARB;
    202         _glShaderSourceARB ShaderSourceARB;
    203         _glCompileShaderARB CompileShaderARB;
    204         _glGetObjectParameterivARB GetObjectParameterivARB;
    205         _glDeleteObjectARB DeleteObjectARB;
    206         _glGetInfoLogARB GetInfoLogARB;
    207         _glCreateProgramObjectARB CreateProgramObjectARB;
    208         _glAttachObjectARB AttachObjectARB;
    209         _glDetachObjectARB DetachObjectARB;
    210         _glLinkProgramARB LinkProgramARB;
    211         _glUseProgramObjectARB UseProgramObjectARB;
    212         _glGetUniformLocationARB GetUniformLocationARB;
    213         _glUniform1iARB Uniform1iARB;
    214         _glUniform1fARB Uniform1fARB;
    215         _glUniform4fARB Uniform4fARB;
    216         _glUniformMatrix4fvARB UniformMatrix4fvARB;
    217152
    218153        _glGenFramebuffersEXT GenFramebuffersEXT;
    … …  
    244179}
    245180
    246 #define glCreateShaderObjectARB getGLExtensionFunctions().CreateShaderObjectARB
    247 #define glShaderSourceARB getGLExtensionFunctions().ShaderSourceARB
    248 #define glCompileShaderARB getGLExtensionFunctions().CompileShaderARB
    249 #define glGetObjectParameterivARB getGLExtensionFunctions().GetObjectParameterivARB
    250 #define glDeleteObjectARB getGLExtensionFunctions().DeleteObjectARB
    251 #define glGetInfoLogARB getGLExtensionFunctions().GetInfoLogARB
    252 #define glCreateProgramObjectARB getGLExtensionFunctions().CreateProgramObjectARB
    253 #define glAttachObjectARB getGLExtensionFunctions().AttachObjectARB
    254 #define glDetachObjectARB getGLExtensionFunctions().DetachObjectARB
    255 #define glLinkProgramARB getGLExtensionFunctions().LinkProgramARB
    256 #define glUseProgramObjectARB getGLExtensionFunctions().UseProgramObjectARB
    257 #define glGetUniformLocationARB getGLExtensionFunctions().GetUniformLocationARB
    258 #define glUniform1iARB getGLExtensionFunctions().Uniform1iARB
    259 #define glUniform1fARB getGLExtensionFunctions().Uniform1fARB
    260 #define glUniform4fARB getGLExtensionFunctions().Uniform4fARB
    261 #define glUniformMatrix4fvARB getGLExtensionFunctions().UniformMatrix4fvARB
    262 
    263181#define glGenFramebuffersEXT getGLExtensionFunctions().GenFramebuffersEXT
    264182#define glGenRenderbuffersEXT getGLExtensionFunctions().GenRenderbuffersEXT
Note: See TracChangeset for help on using the changeset viewer.