summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Added missing precision specifiers to custom shader effect.Samuel Rødal2009-08-261-1/+1
| | | | | | The precision specifiers need to be there on OpenGL ES 2.0. Reviewed-by: Tom
* Removed warnings / debug output in the GL 2 engine / pixmap filter code.Samuel Rødal2009-08-251-1/+0
| | | | Reviewed-by: Tom
* Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-171-1/+1
|\
| * Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Fixed various valgrind-reported issues in GL 2 engine.Samuel Rødal2009-07-291-2/+1
| |
* | Improve GL filter performance by caching custom shader programs.Samuel Rødal2009-07-281-0/+3
| | | | | | | | This brings performance back up to where it was pre-merge.
* | Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffectSamuel Rødal2009-07-281-11/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qglengineshadermanager.cpp src/opengl/gl2paintengineex/qglengineshadermanager_p.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h Merge custom shader / GL blur pixmap filter implementation from graphics team repo with implementation from kinetic graphics-team repo.
| * | Added caching of custom shader programs as well in GL 2 shader manager.Samuel Rødal2009-07-011-1/+4
| | | | | | | | | | | | | | | Ensures that the programs are evicted from the cache when the shaders are destroyed.
| * | Added custom shader hook to the GL 2 paint engine.Samuel Rødal2009-06-301-9/+32
| | | | | | | | | | | | | | | This will make it easier to implement pixmap filters, YUV->RGB conversions, etc in other parts of Qt.
* | | Make it easier to change custom shaders.Rhys Weatherley2009-07-241-0/+1
| | |
* | | Initial stab at a custom shader stage APITom Cooksey2009-07-231-5/+25
| |/ |/|
* | Fixed GL2 engine shader manager to work with more than one context.Kim Motoyoshi Kalland2009-07-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I added a QGLContextResource class which can be used internally in Qt for sharing resources between contexts. The QGLContextResource is a hash map where the context is used as 'key', and the resource is the 'value'. All the sharing contexts point to the same resource, and the resource is automatically deleted when it is not referenced any more. Now, the shader manager uses the QGLContextResource class. I also added a pointer to a struct in the QGLContextPrivate class. The struct is shared between all the sharing contexts and is deleted automatically. Currently, the struct only contains the resolved OpenGL function pointers. The shared context register code has been simplified. Reviewed-by: Tom
* | Moved uniform enum to QGLEngineShaderManager.Kim Motoyoshi Kalland2009-07-031-4/+22
|/ | | | | | Simplified caching of uniform locations. Reviewed-by: Samuel
* Reduced number of state changes/uniform location queries in GL2 engine.Samuel Rødal2009-06-241-3/+10
| | | | | | | Keep track of uniform locations for the current shader program in the shader manager. Also don't change texture parameters unless necessary. Reviewed-by: Kim
* Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* Fixed incorrect rendering of bitmap/pattern brushes in GL 2 engine.Samuel Rødal2009-06-121-1/+7
| | | | | | | | | The pen color should be used when drawPixmap is called with a bitmap, and the brush color should be used for texture patterns that are bitmaps. Task-number: 245802 Reviewed-by: Trond
* 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>
* Implemented QGLTextureGlyphCache to avoid wasting glyph cache memory.Samuel Rødal2009-06-031-0/+4
| | | | | | | | | Now there's only a copy of the texture glyph cache in graphics memory, avoiding the system memory copy that we used earlier. In addition the texture will use the GL_ALPHA texture format when possible, making it consume less graphics memory as well. Reviewed-by: Tom
* Allow release builds againTom Cooksey2009-04-221-2/+0
| | | | The list of shaders shouldn't change too much now.
* Make useCorrectShaderProg() return a bool againTom Cooksey2009-04-221-2/+1
| | | | | Returns true if it had to change the shader program so the engine knows it needs to clean the uniforms.
* Make optimiseForBrushTransform take a QTransform referenceTom Cooksey2009-04-221-1/+1
|
* Kill unused SimpleVertexShader & rename vertex coords arrayTom Cooksey2009-04-201-2/+0
| | | | | | | | Rename inputVertex -> vertexCoordsArray to be more consistent with other vertex attribute array naming conventions. SimpleVertexShader has also been replaced with a combination of MainVertexShader & PositionOnlyVertexShader, so can be killed.
* Refactor opacity handling & make drawImage/drawPixmap work againTom Cooksey2009-04-201-3/+6
|
* Add a "shocking pink" shader for rendering into stencil buffTom Cooksey2009-04-171-0/+1
| | | | | | If you see shocking pink in the rendering output, it's probably because the "simple" shader is in use but color writes have somehow been enabled. :-)
* Clean up existing & implement missing GLSL for new shader managerTom Cooksey2009-04-161-1/+2
|
* Re-write the shader manager & completely break everything ;-)Tom Cooksey2009-04-161-0/+385
generated by cgit v0.12 at 2025-01-01 09:19:12 (GMT)