diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-01-27 22:18:34 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-29 11:21:36 (GMT) |
commit | 24e76d093905ae0ce996bda38546265ab587bc4e (patch) | |
tree | 22aad33a4af7350fd1b8b2ceb56975485a7abb30 /doc/src/snippets/code/src_gui_dialogs_qwizard.cpp | |
parent | 38f7840ccfa4c611bd1fc23598cc525c9c4d49d1 (diff) | |
download | Qt-24e76d093905ae0ce996bda38546265ab587bc4e.zip Qt-24e76d093905ae0ce996bda38546265ab587bc4e.tar.gz Qt-24e76d093905ae0ce996bda38546265ab587bc4e.tar.bz2 |
Better support for user-generated binary shaders
If the user provided their own shader with glShaderBinary(),
QGLShaderProgram::addShader() would refuse to add it because
it wasn't marked as "compiled". According to the OpenGL/ES 2.0
specification:
"It is permissible to attach a shader object to a
program object before source code has been loaded into the
shader object or before the shader object has been compiled."
Based on this, the compile check has been removed from addShader()
which should make supporting binary shaders easier.
Similarly, link() and programId() have been modified to support
applications that use glProgramBinaryOES() to specify program binaries.
Task-number: QTBUG-7490
Reviewed-by: Tom Cooksey
(cherry picked from commit 6b6b206ed8634323570712e003fc159fbf5f8303)
Diffstat (limited to 'doc/src/snippets/code/src_gui_dialogs_qwizard.cpp')
0 files changed, 0 insertions, 0 deletions