From 4d326555ab60e9f19dddaabc34bbabc2a3ebb514 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Fri, 22 Jun 2018 16:27:19 +0200 Subject: Doc: Add Hello GLES3 example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-67109 Change-Id: I55135264a63b78502b300de723a25b3f363af58b Reviewed-by: Topi Reiniö --- .../hellogles3/doc/images/hellogles3-example.png | Bin 0 -> 61792 bytes examples/opengl/hellogles3/doc/src/hellogles3.qdoc | 46 +++++++++++++++++++++ examples/opengl/hellogles3/glwindow.cpp | 3 +- examples/opengl/hellogles3/qtlogo.png | Bin 5402 -> 2318 bytes 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 examples/opengl/hellogles3/doc/images/hellogles3-example.png create mode 100644 examples/opengl/hellogles3/doc/src/hellogles3.qdoc (limited to 'examples') diff --git a/examples/opengl/hellogles3/doc/images/hellogles3-example.png b/examples/opengl/hellogles3/doc/images/hellogles3-example.png new file mode 100644 index 0000000000..e089b9470a Binary files /dev/null and b/examples/opengl/hellogles3/doc/images/hellogles3-example.png differ diff --git a/examples/opengl/hellogles3/doc/src/hellogles3.qdoc b/examples/opengl/hellogles3/doc/src/hellogles3.qdoc new file mode 100644 index 0000000000..fbe071f143 --- /dev/null +++ b/examples/opengl/hellogles3/doc/src/hellogles3.qdoc @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example hellogles3 + \title Hello GLES3 Example + \ingroup examples-widgets-opengl + + \brief The Hello GLES3 example demonstrates easy, cross-platform usage of + OpenGL ES 3.0 functions via QOpenGLExtraFunctions in an application that + works identically on desktop platforms with OpenGL 3.3 and mobile/embedded + devices with OpenGL ES 3.0. + + The code is always the same, with the exception of two places: + \list + \li The OpenGL context creation has to have a sufficiently high version + number for the features that are in use. + \li The shader code's version directive is different. + \endlist + + \image hellogles3-example.png +*/ diff --git a/examples/opengl/hellogles3/glwindow.cpp b/examples/opengl/hellogles3/glwindow.cpp index 13cbc41ce8..9458b74810 100644 --- a/examples/opengl/hellogles3/glwindow.cpp +++ b/examples/opengl/hellogles3/glwindow.cpp @@ -243,7 +243,8 @@ void GLWindow::initializeGL() f->glEnableVertexAttribArray(0); f->glEnableVertexAttribArray(1); f->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), 0); - f->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), reinterpret_cast(3 * sizeof(GLfloat))); + f->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), + reinterpret_cast(3 * sizeof(GLfloat))); m_vbo->release(); f->glEnable(GL_DEPTH_TEST); diff --git a/examples/opengl/hellogles3/qtlogo.png b/examples/opengl/hellogles3/qtlogo.png index 868fcea860..9cb2e01d38 100644 Binary files a/examples/opengl/hellogles3/qtlogo.png and b/examples/opengl/hellogles3/qtlogo.png differ -- cgit v1.2.3