diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-01-27 22:18:34 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-01-27 22:18:34 (GMT) |
commit | 6b6b206ed8634323570712e003fc159fbf5f8303 (patch) | |
tree | fdb1432a8ab0b86250ecf3d2b89e9f0c4e62f69c /tools/designer | |
parent | ca43022cb80be68a1f32afc2d2ab75f6bf103abb (diff) | |
download | Qt-6b6b206ed8634323570712e003fc159fbf5f8303.zip Qt-6b6b206ed8634323570712e003fc159fbf5f8303.tar.gz Qt-6b6b206ed8634323570712e003fc159fbf5f8303.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
Diffstat (limited to 'tools/designer')
0 files changed, 0 insertions, 0 deletions