summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-032-30/+3
|\
| * Fixed some compiler warnings.Samuel Rødal2009-11-032-30/+3
| | | | | | | | Reviewed-by: Trond
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-033-16/+17
|\ \ | |/ |/|
| * Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-021-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll
| * Compilation error qegl_p.h not found for OpenGL ES enabled build of QtKeith Isdale2009-11-021-3/+3
| | | | | | | | | | | | | | | | | | for WindowsCE Be more consistant in the usage of <private/foo_p.h> vs "foo_p.h" Task-number: QTBUG-5149 Reviewed-by: Trond Kjernåsen
| * Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-1/+4
| |\
| | * Merge branch '4.6' into 4.6-platformDenis Dzyubenko2009-10-267-78/+376
| | |\
| | * | Remove internal widgets from QApplication::topLevelWidgets()Prasanth Ullattil2009-10-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some internal hidden widgets which should not come up in the QApplication::topLevelWidgets() list. So the known ones are being removed from the QWidgetPrivate::allWidgets set. Task-number: QTBUG-739 Reviewed-by: Denis Dzyubenko Reviewed-by: Bradley T. Hughes
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-026-31/+403
|\ \ \ \
| * | | | Minor doc fixes for QGLContext::BindOption.Samuel Rødal2009-11-021-1/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
| * | | | Fixed compiler warning on GCC about empty while statement.Samuel Rødal2009-11-021-1/+1
| | | | |
| * | | | Optimized animated blur radii in the GL 2 paint engine.Samuel Rødal2009-11-023-12/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We add an internal cache which keeps four half-scaled versions of the source pixmap at different blur radii, then we simply interpolate between the two pixmaps around the desired blur radius, or between the base source pixmap and the first blurred version. Reviewed-by: Gunnar Sletta
| * | | | Moved Qt::RenderHint back into QGraphicsBlurEffect and added a hint.Samuel Rødal2009-11-021-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added AnimationHint, which didn't make too much sense in a generic enum, so Qt::RenderHint was moved back into QGraphicsBlurEffect as QGraphicsBlurEffect::BlurHint. Reviewed-by: Gunnar Sletta
| * | | | Added strict size parameter to QGLFramebufferObject pool.Samuel Rødal2009-11-022-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strict size parameter can be used when it's critical that we get the exact size we ask for. Reviewed-by: Gunnar Sletta
* | | | | Better cosmetic pen scaling for beziers in tristroker.Gunnar Sletta2009-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Samuel
* | | | | Safeguard isNull() pixmaps in bindTexture and remove a compile warningGunnar Sletta2009-11-022-1/+40
|/ / / / | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | Remove partial shader support from QGLShader/QGLShaderProgramRhys Weatherley2009-11-012-185/+6
| | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | Implement a simple caching algorithm for shader programs.Tom Cooksey2009-10-302-31/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the number of programs held in the cache exceeds a threshold, the least frequantly used programs get deleted. This also covers programs with custom snippets of code. As a conequence, when a QGLCustomShaderStage gets deleted, any programs using that code will (eventually) be freed. Reviewed-By: Samuel Rødal
* | | | Rename qglEngineShaderSourceCode to qShaderSnippetsTom Cooksey2009-10-302-71/+93
| | | | | | | | | | | | | | | | This patch also adds a "snippetNameStr" helper for debugging.
* | | | Refactor of shader manager to not use partial shadersTom Cooksey2009-10-304-217/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a first step towards supporting binary shaders. Note: This change will introduce a (rare) leak of shader objects, as the shaders will never be kicked out from the cache (because the cache is still a QList) :-) This will be corrected by the next patch. Reviewed-By: Samuel
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-303-4/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Added QImagePixmapCleanupHooks functions for enabling hooks.Samuel Rødal2009-10-293-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Better than having to befriend QPixmapData and setting is_cached manually. Reviewed-by: Tom Cooksey
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-304-222/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Remove shader/program binary support for nowRhys Weatherley2009-10-282-222/+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
| * | | Fix namespace buildRichard Moe Gustavsen2009-10-282-0/+6
| | |/ | |/| | | | | | | | | | | | | Looks like a couple of files missed the namespace macro... Rev-By: gunnar
* | | Made internal FBOs snap to power-of-two when not wasting too much space.Samuel Rødal2009-10-291-2/+15
| | | | | | | | | | | | | | | | | | This improves performance on certain OpenGL ES 2.0 platforms. Reviewed-by: Gunnar Sletta
* | | Got rid of redundant texture parameter settings in GL pixmap filters.Samuel Rødal2009-10-291-16/+0
| | | | | | | | | | | | | | | | | | The texture parameters are set in drawTexture anyways. Reviewed-by: Gunnar Sletta
* | | Added some optimizations to the blur and drop shadow GL filters.Samuel Rødal2009-10-294-181/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use ExpandToTransparentBorderPadMode since we can use GL_CLAMP_TO_EDGE to clamp to the texture. * Shrink the bounding rects reported by the blur and drop shadow filters (expanding by 2 * radius isn't needed). * Use a single-pass blur for radii <= 3 to avoid the overhead of rendering to an FBO. * Made the fast blur setting generate filters for only a predefined set of radii, and then use the actual blur radius to spread the sample points outwards. * Optimized the generated program to rely less on temporary variables, as those seemed to not be handled very well by certain GLSL compilers. Reviewed-by: Gunnar Sletta
* | | Fix bug for message error "Texture updload failed, error code 0x500"Stefano Pironato2009-10-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message come from the QGLContextPrivate::bindTexture. But since OpenGl errors are retains until glGetError is called the actual error was happening somewhere else. After adding in all the gl* call a check for a gl error, I was able to get the place where opengl fail with a GL_INVALID_ENUM. This happen in the call of glEnable(GL_TEXTURE_2D) in the file qgl_x11egl.cpp. This glEnable call does not need: removed. Reviewed-by: Tom Cooksey
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-271-2/+2
|\ \ \
| * | | Made blur and drop shadow APIs use qreal instead of int for blur radius.Samuel Rødal2009-10-271-2/+2
| |/ / | | | | | | | | | | | | | | | | | | There's no reason to lock ourselves to int in the API when some of the backend could handle floating point blur radii. Reviewed-by: Bjørn Erik Nilsen
* | | Merge branch 'vectorpath' into 4.6Gunnar Sletta2009-10-271-3/+1
|\ \ \
| * | | Make use of QVectorPath::isConvex() to speed up rounded rect fillingGunnar Sletta2009-10-271-3/+1
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | Reset the GL error stack prior to checking for errors in bindTexture()Gunnar Sletta2009-10-271-0/+5
|/ / / | | | | | | | | | Reviewed-by: Tom
* | | Kill a tiny few sin/cos/sqrt calls in the new strokerGunnar Sletta2009-10-262-3/+12
|/ / | | | | | | Reviewed-by: Eskil
* | Suppress warnings in QtOpenGL codeRhys Weatherley2009-10-263-1/+5
| |
* | Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgramRhys Weatherley2009-10-261-0/+55
| |
* | Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-inRhys Weatherley2009-10-261-1/+1
| |
* | Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivateRhys Weatherley2009-10-262-47/+134
| | | | | | | | Reviewed-by: Sarah Smith
* | Optimize concatenation of partial shadersRhys Weatherley2009-10-262-30/+95
| | | | | | | | Reviewed-by: Sarah Smith
* | Issue a warning if bindAttributeLocation() is used after shaders linkedRhys Weatherley2009-10-251-3/+8
| | | | | | | | | | | | | | | | | | Attribute locations must be bound before a shader program is linked according to the GLSL specification. Issue a warning to the user if they do it in the wrong order, which should help to isolate hard to find bugs much quicker. Reviewed-by: trustme
* | Added license headers to new filesGunnar Sletta2009-10-222-0/+82
|/
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-221-1/+1
|\ | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp
| * Fix dangling shader manager pointersJulian de Bhal2009-10-201-1/+1
| | | | | | | | | | | | | | | | | | The QGLEngineShaderManager pointers in QGLCustomShaderStagePrivate have been changed to QPointers to prevent the QGLPixmapFilters in QGL2PaintEngineEx from dereferencing the QGLEngineShaderManager after it is destroyed. Reviewed-by: Rhys Weatherley
* | Fixed an assert when running the composition demo on Mac.Trond Kjernåsen2009-10-201-16/+19
| | | | | | | | | | | | | | We can't create a QGLWidget in the QGLEngineSelector, since it may be called before a QApplication object has been constructed. Reviewed-by: Kim
* | Make sure QGLTextureCache exists when creating surfaces for pixmapsTom Cooksey2009-10-202-2/+8
| | | | | | | | | | | | | | QGLTextureCache installs pixmap cleanup hooks which are used to clean up the EGL surfaces. Reviewed-By: Trustme
* | Add a new window surface which utilises QX11GLPixmapDataTom Cooksey2009-10-205-4/+239
| | | | | | | | | | The new surface uses XCopyArea to post updates to the window and thus, supports partial updates.
* | Fixed a stencil clearing bug in the GL 1 engine.Trond Kjernaasen2009-10-201-19/+21
| | | | | | | | | | | | | | | | If the system clip changed the stencil buffer wasn't necessarily updated correctly. Use a region to keep track of the dirty areas in the stencil buffer, like we do in the GL 2 engine. Reviewed-by: Samuel
* | Fix build on desktop X11Tom Cooksey2009-10-202-3/+1
| | | | | | | | Hash-Define out X11GL pixmap data until the GLX implementation is ready.
* | Use different GL contexts for ARGB & RGB pixmapsTom Cooksey2009-10-191-31/+100
| | | | | | | | | | | | | | | | | | On 16 bpp systems, RGB pixmaps are 16-bit whereas ARGB pixmaps are 32-bit. This means two different EGL configs are used which are incompatable with each other. As a result, we have to use 2 different EGL contexts - one for each config. Reviewed-By: Trustme
generated by cgit v0.12 at 2024-12-11 23:02:38 (GMT)