Changeset 561 for trunk/demos/boxes/glextensions.cpp

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:

• . (modified) (1 prop)
• demos/boxes/glextensions.cpp (modified) (5 diffs)

trunk/demos/boxes/glextensions.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -47 +47 @@
 {
         bool ok = true;
-
-        RESOLVE_GL_FUNC(CreateShaderObjectARB)
-        RESOLVE_GL_FUNC(ShaderSourceARB)
-        RESOLVE_GL_FUNC(CompileShaderARB)
-        RESOLVE_GL_FUNC(GetObjectParameterivARB)
-        RESOLVE_GL_FUNC(DeleteObjectARB)
-        RESOLVE_GL_FUNC(GetInfoLogARB)
-        RESOLVE_GL_FUNC(CreateProgramObjectARB)
-        RESOLVE_GL_FUNC(AttachObjectARB)
-        RESOLVE_GL_FUNC(DetachObjectARB)
-        RESOLVE_GL_FUNC(LinkProgramARB)
-        RESOLVE_GL_FUNC(UseProgramObjectARB)
-        RESOLVE_GL_FUNC(GetUniformLocationARB)
-        RESOLVE_GL_FUNC(Uniform1iARB)
-        RESOLVE_GL_FUNC(Uniform1fARB)
-        RESOLVE_GL_FUNC(Uniform4fARB)
-        RESOLVE_GL_FUNC(UniformMatrix4fvARB)
 
         RESOLVE_GL_FUNC(GenFramebuffersEXT)
@@ -87 +70 @@
 
         return ok;
-}
-
-bool GLExtensionFunctions::glslSupported() {
-    return CreateShaderObjectARB
-            && CreateShaderObjectARB
-            && ShaderSourceARB
-            && CompileShaderARB
-            && GetObjectParameterivARB
-            && DeleteObjectARB
-            && GetInfoLogARB
-            && CreateProgramObjectARB
-            && AttachObjectARB
-            && DetachObjectARB
-            && LinkProgramARB
-            && UseProgramObjectARB
-            && GetUniformLocationARB
-            && Uniform1iARB
-            && Uniform1fARB
-            && Uniform4fARB
-            && UniformMatrix4fvARB;
 }