summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Collapse)AuthorAgeFilesLines
* Fix y orientation of pixmap brushes and pixmaptiles in gl1 engineGunnar Sletta2009-08-274-3525/+3370
| | | | Reviewed-by: Samuel
* Don't flip texture coords in texture brushes in accordance with new bindTextureGunnar Sletta2009-08-271-1/+0
| | | | Reviewed-by: Trond
* compile on x11Gunnar Sletta2009-08-271-1/+1
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-279-115/+108
|\ | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * Make QGLShader::ShaderType slightly more future proof byGunnar Sletta2009-08-272-8/+18
| | | | | | | | | | | | 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-272-52/+28
| | | | | | | | | | | | | | | | | | | | | | 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
| * Made GL 2 engine reset various GL state to their defaults in end().Samuel Rødal2009-08-262-3/+10
| | | | | | | | | | | | | | | | This makes mixing GL and QPainter code safer. We need to be able to assume default GL state in begin(), and set back whatever we change to the default state in end() in the GL 2 paint engine. Reviewed-by: Trond
| * Made brush textures in GL2 engine use correct filtering.Samuel Rødal2009-08-261-8/+10
| | | | | | | | | | | | | | Only use bilinear filtering when SmoothPixmapTransform render hint is used. Reviewed-by: Kim
| * Improved GLSL precision specifiers in GL 2 engine.Samuel Rødal2009-08-261-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recommended specifiers are lowp for colors / normal vectors, mediump for texture coordinates when a limited range is sufficient, and highp for generic texture coordinates and vertex coordinates / transformation matrices. We used to use mediump for texture coordinate in some places, but since we don't control the texturing scenarios we need to handle the worst case, which is zooming in on part of a large texture (2048x2048) with bilinear filtering. To properly handle this case without color banding mediump is probably not sufficient, so we'll use highp for texture coordinates. Reviewed-by: Tom
| * Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-263-3/+10
| | | | | | | | | | | | | | | | Previously we were using QPaintEngine::syncState() which is not ideal naming-wise, since it actually prepares for native painting instead of syncing the painter's state to native state. Reviewed-by: Trond
| * Remove Graphics View dependency from QGraphicsShaderEffect.Bjørn Erik Nilsen2009-08-262-8/+0
| | | | | | | | Graphics effects are no longer in the Graphics View module.
| * doc: fixes qdoc warnings/errors related to the Graphics Effect framework.Bjørn Erik Nilsen2009-08-261-1/+1
| | | | | | | | Reviewed-by: Kavindra
| * Added missing precision specifiers to custom shader effect.Samuel Rødal2009-08-264-8/+8
| | | | | | | | | | | | The precision specifiers need to be there on OpenGL ES 2.0. Reviewed-by: Tom
* | make x11 compile...Gunnar Sletta2009-08-271-3/+3
| |
* | New variant of QGLContext::bindTexture that does not require mipmap generationGunnar Sletta2009-08-279-89/+308
|/ | | | | | | and y-axis inversion and overall less conversion, making significantly faster for plain usecases Reviewed-by: Trond
* Fixed clipping bug in GL 2 paint engine (visible in arthur demos).Samuel Rødal2009-08-261-1/+1
| | | | | | | | | | QVectorPath::hints() is not a strict bit field, and thus can not be anded with RectangleHint. Instead, QVectorPath::shape() should be directly compared with RectangleHint to check if the vector path is a rectangle or not. In this case the first four points of a regular painter path were treated as a rectangle with dire consequences. Reviewed-by: Tom
* Fixed documentation and use of incorrect entry point for custom shaders.Samuel Rødal2009-08-252-12/+9
| | | | | | | The entry point has been changed to be customShader, taking source image and texture coordinates as parameters. Reviewed-by: Tom
* Removed warnings / debug output in the GL 2 engine / pixmap filter code.Samuel Rødal2009-08-253-4/+1
| | | | Reviewed-by: Tom
* Fix obsolete license headers.Jason McDonald2009-08-212-6/+6
| | | | Reviewed-by: Trust Me
* Fix obsolete license headers.Jason McDonald2009-08-212-5/+5
| | | | Reviewed-by: Trust Me
* compile fix with namespaces in QGLCustomShaderStagePrivatehjk2009-08-211-0/+4
|
* Fix drawTiledPixmap for texture_from_pixmap on X11/EGLTom Cooksey2009-08-212-0/+5
| | | | | | | QGLContextPrivate::bindTextureFromNativePixmap() needs to abort if it's not allowed to return a y-inverted texture. Reviewed-by: Trustme
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2113-115/+1211
|\ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| * Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-213-43/+10
| |\ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri
| * | Add "QObject *parent = 0" to QGraphicsShaderEffect constructor.Bjørn Erik Nilsen2009-08-202-3/+3
| | | | | | | | | | | | See also 39f5298ef2c0424e7b4916d8d1de1d46e534daee
| * | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-197-23/+42
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-1755-61/+81
| |\ \ \
| * \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-0710-115/+473
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/auto.pro
| * | | | | QGraphicsShaderEffect doesn't need to be a metatype any moreRhys Weatherley2009-07-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | | Merge branch 'kinetic-graphicseffect' of ↵Bjørn Erik Nilsen2009-07-293-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects
| | * | | | | Fixed various valgrind-reported issues in GL 2 engine.Samuel Rødal2009-07-293-7/+7
| | | | | | |
| * | | | | | Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0eddBjørn Erik Nilsen2009-07-292-22/+16
| |/ / / / / | | | | | | | | | | | | | | | | | | Makes QGraphicsShaderEffect compatible with the new QGraphicsEffect API.
| * | | | | Improve GL filter performance by caching custom shader programs.Samuel Rødal2009-07-282-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | This brings performance back up to where it was pre-merge.
| * | | | | Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffectSamuel Rødal2009-07-2810-77/+453
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Further optimized the GL blur filter by caching the QGLShader.Samuel Rødal2009-07-022-4/+9
| | | | | | |
| | * | | | | Fixed GL blur filter to handle painter translates and larger FBO sizes.Samuel Rødal2009-07-021-1/+17
| | | | | | |
| | * | | | | Made GL blur filter use the new FBO pool for improved performance.Samuel Rødal2009-07-021-12/+16
| | | | | | |
| | * | | | | Refactored the GL QPixmap backend to use an FBO pool class.Samuel Rødal2009-07-022-41/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FBO pool will be useful in other places as well, plus it makes it easier to deal with graphics memory management issues.
| | * | | | | Added caching of custom shader programs as well in GL 2 shader manager.Samuel Rødal2009-07-012-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that the programs are evicted from the cache when the shaders are destroyed.
| | * | | | | Added QPixmapBlurFilter with GL implementation.Samuel Rødal2009-06-301-1/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No raster engine based fallback so far... Also, performance is lacking since the QGLShaderProgram isn't cached.
| | * | | | | Added missing createPixmapFilter() implementation in GL 2 engine.Samuel Rødal2009-06-302-0/+10
| | | | | | |
| | * | | | | Added drawTexture function to GL 2 paint engine.Samuel Rødal2009-06-302-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Works just like drawImage / drawPixmap but uses the given texture id.
| | * | | | | Added custom shader hook to the GL 2 paint engine.Samuel Rødal2009-06-305-24/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to implement pixmap filters, YUV->RGB conversions, etc in other parts of Qt.
| * | | | | | Update QGraphicsShaderEffect to match new APIRhys Weatherley2009-07-242-32/+37
| | | | | | |
| * | | | | | Reset shader stage variables when the custom shader is explicitly removed.Rhys Weatherley2009-07-241-0/+2
| | | | | | |
| * | | | | | Implement QGraphicsShaderEffect for custom shader-based effectsRhys Weatherley2009-07-243-0/+413
| | | | | | |
| * | | | | | Make it easier to change custom shaders.Rhys Weatherley2009-07-244-0/+26
| | | | | | |
| * | | | | | Make ordinary shaders work again after custom shader changes.Rhys Weatherley2009-07-241-7/+7
| | | | | | |
| * | | | | | Actually add the files... :-)Tom Cooksey2009-07-232-0/+196
| | | | | | |
| * | | | | | Initial stab at a custom shader stage APITom Cooksey2009-07-235-56/+133
| | | | | | |
generated by cgit v0.12 at 2024-11-18 14:15:49 (GMT)