summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Implemented QGLTextureGlyphCache to avoid wasting glyph cache memory.Samuel Rødal2009-06-031-27/+171
| | | | | | | | | 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
* Made GL2 engine default for QGLWidget, and added GL2 sync() functionSamuel Rødal2009-05-291-0/+37
| | | | | | | | | | | | To allow mixing QPainter and raw OpenGL commands we need to have some way for the user to say that's he's about to use raw OpenGL so that we are free to do buffering optimizations in the paint engines and use either GL1 or GL2 paint engine. As there's already a syncState() function in QPaintEngine we've reused this and added QPaintEngineEx::sync() which takes care of syncing/flushing the paint engine. Reviewed-by: Trond
* Fixed bug in GL graphics system when painting to pixmaps.Samuel Rødal2009-05-281-0/+3
| | | | | Make sure the correct texture unit is active when copying from the pixmap to the FBO in begin().
* Fixed incorrect handling of composition modes in GL2 paint engine.Samuel Rødal2009-05-281-21/+10
| | | | | | | | Even if the source pixels are opaque we have to enable blending for the non-trivial composition modes. Some of the composition modes are independent of source alpha and depend on destination alpha for example. Reviewed-by: Tom
* Compile fix with namespaces.hjk2009-05-281-1/+6
|
* Moved QGL2PaintEngineExPrivate into GL2 paint engine header file.Samuel Rødal2009-05-281-91/+0
| | | | Reviewed-by: Tom
* Make QGLWidgets have the same background colour as QWidgetsTom Cooksey2009-05-271-15/+8
| | | | | | | | QWidgets are filled with Qt::transparent when WA_TranslucentBackground is set, reguardless of what their background colour has been set to. This patch makes QGLWidgets behave the same way. Reviewed-By: Samuel Rødal
* Make WA_TranslucentBackground work on QGLWidget for X11Tom Cooksey2009-05-271-0/+10
| | | | | | | This patch enables QGLWidget's to have an ARGB visual on X11, alowing GL rendering on semi-transparent windows. Reviewed-By: Trond
* Avoided expensive image upload for GL pixmap backend for QPixmap::fill.Samuel Rødal2009-05-271-1/+7
| | | | | | | In the fill case we can simply set a flag saying the pixmap needs to be filled, and then when painting on the pixmap we start by filling the background using glClear via the existing QGLDrawable::autoFillBackground interface.
* Fixed bugs in GL2 paint engine when several engines are active.Samuel Rødal2009-05-271-29/+17
| | | | | | | Make sure makeCurrent() on a window surface unbinds any active FBO, and simplify ensureActive() code in GL2 paint engine a bit. We don't need the last_engine pointer as ensureActive() will take care of ensuring the correct engine is active anway.
* Fixed broken system clip handling in GL2 paint engine.Samuel Rødal2009-05-251-0/+11
| | | | | | Override systemStateChanged() to get the system clip updates. Reviewed-by: Trond
* Make QtOpenGL compile on OpenGL ES 1.1 againTom Cooksey2009-05-141-2/+2
|
* Enabled compilation of both GL and GL2 paint engine.Samuel Rødal2009-05-131-11/+11
| | | | | | | Compile both GL and GL2 paint engine on desktop, and choose between them at run-time based on GL version flags. Reviewed-by: Tom
* Big GL Extension CleanupTom Cooksey2009-05-061-2/+3
| | | | | | | | | Clean up the extension naming and make things build on OpenGL ES 2.0 again. All the extensions which made it into OpenGL 2.0 spec have have the EXT postfix removed. This also eliminates defines on ES 2.0 as the code now refers to the in-spec names. Reviewed-by: sroedal
* Make useCorrectShaderProg() return a bool againTom Cooksey2009-04-221-3/+1
| | | | | Returns true if it had to change the shader program so the engine knows it needs to clean the uniforms.
* Merge branch 'master' into gl2engine-new-shadersSamuel Rødal2009-04-221-43/+135
|\ | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * Prevent copy back from FBO when initializing render FBO from texture.Samuel Rødal2009-04-201-1/+1
| |
| * Smudgy text in GL2 paint engine when drawing on non-integer offsets.Samuel Rødal2009-04-171-21/+39
| | | | | | | | | | | | | | | | | | Special-case TextDrawingMode in updateMatrix() as we know that we'll have a pure translating transform, and round the transform's dx and dy to avoid drawing on non-integer offsets. Task-number: 245806 Reviewed-by: Tom
| * Correctly handle using GL pixmaps that still have an active engine.Samuel Rødal2009-04-171-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where a GL pixmap is used when there it still has an active engine we need to ensure that the pixmap has been flushed from the render FBO first. The newly added QGLPixmapData::copyBackFromRenderFbo() handles this. In addition, because several GL 2 paint engines can be active on the same context at the same time, we can't make any assumptions and need to call the newly added QGL2PaintEngineEx::ensureCreated() in the beginning of any state-dependent paint engine function. QGL2PaintEngineEx::ensureCreated() correctly transfers control to the current engine if a different engine is active. Running lance with -pixmap and -graphicssystem opengl works correctly with the GL pixmap backend now.
| * Use FBOs as pixmap backend in GL graphics system.Samuel Rødal2009-04-161-1/+37
| | | | | | | | | | | | | | | | We now use FBOs to implement render-to-pixmap for the GL pixmap backend. A multisample FBO is used for rendering, and is then blitted onto a non-multisample FBO dynamically bound to the relevant texture. Reviewed-by: Tom
| * GL2: Avoid expensive updateDepthClip() every time setState() is calledSamuel Rødal2009-04-161-16/+14
| | | | | | | | Only call updateDepthClip() if the clip has actually changed.
* | Make text rendering work again on the GL2 engineTom Cooksey2009-04-211-41/+44
| | | | | | | | | | - But now it can handle non-solid-color pens, the whole reason for the refactor in the first place.
* | Refactor opacity handling & make drawImage/drawPixmap work againTom Cooksey2009-04-201-70/+69
| |
* | Make fillRect() with a QBrush(Qt::NoBrush) a noopTom Cooksey2009-04-161-0/+3
| |
* | Adapt GL2 Paint Engine to new math3d, shader & shader manager APIsTom Cooksey2009-04-161-43/+43
| |
* | Re-write the shader manager & completely break everything ;-)Tom Cooksey2009-04-161-2/+2
|/
* Fixes: Make FBO window surface work with GL 2 paint engine.Samuel Rødal2009-04-011-0/+3
| | | | | | RevBy: Trond Details: Need to make sure clipping/scissoring etc is turned off and that we are in a good state.
* Fixes: Respect the SmoothPixmapTransform render hint in the GL2 paint engine.Samuel Rødal2009-04-011-1/+1
| | | | RevBy: Tom
* Fixes: Get rid of GL 2 paint engine debug message...Samuel Rødal2009-04-011-2/+0
| | | | RevBy: Tom
* Fixes: Small optimizations in GL 2 paint engine...Samuel Rødal2009-04-011-3/+3
| | | | RevBy: Tom
* Fixes: Clipping bug in GL 2 paint engine (embeddeddialogs demo).Samuel Rødal2009-04-011-0/+1
| | | | RevBy: Tom
* Fixes: Introduce mode transfer functions in the GL 2 paint engine.Samuel Rødal2009-04-011-51/+92
| | | | | | | | RevBy: Tom Details: Mode transfer lets us optimize the case where the same operation is done a lot of times in a row, for example image or text drawing, by being able to assume that most of the state has already been set up properly.
* Fixes: GL 2 paint engine text rendering optimization.Samuel Rødal2009-04-011-56/+45
| | | | | | | RevBy: Tom Details: Buffer vertex and texture coordinates so that we get away with just a single glDrawArrays call per text item. Also move drawCachedGlyphs() into the private class.
* Fixes: Improve text rendering in GL 2 paint engine.Samuel Rødal2009-04-011-2/+2
| | | | | Details: Avoid adding 0.5 to dx() / dy() which caused images / glyphs to get slight antialiasing and edge artifacts.
* Get rid of warning introduced in the last commit.Samuel Rødal2009-04-011-1/+1
|
* Fixes: Move QGLDrawable into qgl_p.h so that we can use it in the GL 2 ↵Samuel Rødal2009-04-011-9/+10
| | | | | | | | paint engine. RevBy: Tom Details: Now we can use the GL 2 paint engine on non-widget paint devices like pixel buffers, framebuffer objects, and GL window surfaces. Using -graphicssystem opengl works now.
* Merge branch 'gl2text' of ..\qt-mainKim Motoyoshi Kalland2009-04-011-0/+6
|
* Long live Qt!Lars Knoll2009-03-231-0/+1278
generated by cgit v0.12 at 2025-01-09 11:34:29 (GMT)