summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'geometry-shaders-to-integrate'Gunnar Sletta2010-02-081-1/+23
|\ | | | | | | | | Conflicts: src/opengl/qglshaderprogram.cpp
| * Another round of Geometry shader review.Gunnar Sletta2010-02-081-8/+8
| | | | | | | | Reviewed-by: Trond
| * Fix Geometry shaders based on reviewGunnar Sletta2010-02-041-1/+1
| |
| * Geometry Shader support in QGLShaderProgramGunnar Sletta2010-02-011-1/+23
| |
* | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-051-0/+11
| | | | | | | | | | Task-number: QTBUG-7391 Reviewed-by: Sarah Smith
* | Improvements to the QGLShaderProgram APIRhys Weatherley2010-02-041-0/+13
| | | | | | | | | | | | | | | | | | | | GLfloat[2][2] & GLfloat[3][3] uniform setters. Generic overrides to setAttributeArray() for setting the component type to something other than GL_FLOAT. setAttributeBuffer() for specifiying offsets within vertex buffers. Task-number: QTBUG-7391 Reviewed-By: Sarah Smith
* | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-1/+1
|/ | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-071-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-061-4/+0
|/ | | | | | | | | | | We don't add new public methods in patch releases. This reverts commit 2b4d3391fd922dfc5ac28815bbd5f36c4041b658. This patch also fixes the paint engine to use glUniformMatrix3fv directly now it has been removed from 4.6. It is a 3 line change. Reviewed-By: Samuel
* Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgramTom Cooksey2009-12-221-0/+4
| | | | Reviewed-By: Rhys Weatherley
* Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-051-21/+22
| | | | Reviewed-by: Sarah Smith
* Add QMacGLCompatTypes to QGLShaderProgram APITom Cooksey2009-11-041-0/+11
|
* Remove partial shader support from QGLShader/QGLShaderProgramRhys Weatherley2009-11-011-8/+1
| | | | Reviewed-by: trustme
* Remove shader/program binary support for nowRhys Weatherley2009-10-281-9/+0
| | | | | | | | | | After API review discussions, it was decided to remove shader binary support until we have a better handle on what we need. Applications can directly load shader binaries on the shaderId() using glShaderBinary() directly so they aren't prevented from using the feature. Reviewed-by: trustme
* Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivateRhys Weatherley2009-10-261-4/+2
| | | | Reviewed-by: Sarah Smith
* Optimize concatenation of partial shadersRhys Weatherley2009-10-261-0/+2
| | | | Reviewed-by: Sarah Smith
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Remove QGLShader from its QGLShaderProgram when it is destroyedRhys Weatherley2009-08-311-0/+3
| | | | Reviewed-by: Samuel
* Remove extraneous semi-colonsRhys Weatherley2009-08-271-2/+2
| | | | Reviewed-by: trustme
* Make QGLShader::ShaderType slightly more future proof byGunnar Sletta2009-08-271-5/+12
| | | | | | making it into a bitmask. I'll add GeometryShader in the future Reviewed-by: Rhys Weatherley
* API improvements for creating shaders from filesRhys Weatherley2009-08-271-2/+1
| | | | | | | | | | | It used to be possible to derive the shader type from the file extension, but this isn't very extensible and doesn't capture the usual extensions. Change it so that the shader type must be supplied explicitly. Also add the addShaderFromFile() function to QGLShaderProgram to provide a convenient short-cut for file-based shader creation. Reviewed-by: Sarah Smith
* Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵David Faure2009-06-041-2/+2
| | | | | | | seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improvements to shader API in response to API reviewRhys Weatherley2009-06-041-10/+6
| | | | | Task-number: QT-80 Reviewed-by: Ian Walters
* Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-011-1/+1
| | | | Reviewed-by: trustme
* Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-011-0/+2
| | | | Reviewed-by: trustme
* Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-011-1/+1
| | | | Reviewed-by: trustme
* Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-011-2/+2
| | | | | | | The shader compilers also report warnings, so it is more appropriate to call the string a log. Reviewed-by: trustme
* Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-05-011-0/+10
| | | | Reviewed-by: Rhys Weatherley
* Import shader implementation from before the history cut.Rhys Weatherley2009-03-231-0/+285
generated by cgit v0.12 at 2024-11-15 17:41:19 (GMT)