diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /examples/gui/openglwindow/main.cpp | |
parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
parent | 281121697340084f7d385eab530f41916789b94d (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'examples/gui/openglwindow/main.cpp')
-rw-r--r-- | examples/gui/openglwindow/main.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/examples/gui/openglwindow/main.cpp b/examples/gui/openglwindow/main.cpp index 6ab05176a6..d79ecd6510 100644 --- a/examples/gui/openglwindow/main.cpp +++ b/examples/gui/openglwindow/main.cpp @@ -57,8 +57,6 @@ public: void render() Q_DECL_OVERRIDE; private: - GLuint loadShader(GLenum type, const char *source); - GLuint m_posAttr; GLuint m_colAttr; GLuint m_matrixUniform; @@ -113,14 +111,6 @@ static const char *fragmentShaderSource = //! [3] //! [4] -GLuint TriangleWindow::loadShader(GLenum type, const char *source) -{ - GLuint shader = glCreateShader(type); - glShaderSource(shader, 1, &source, 0); - glCompileShader(shader); - return shader; -} - void TriangleWindow::initialize() { m_program = new QOpenGLShaderProgram(this); |