summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Collapse)AuthorAgeFilesLines
* Fix possible X11/EGL crash.Michael Brasser2009-05-201-4/+10
| | | | | Changed-by: Rhys Weatherley Reviewed-by: Tom Cooksey
* Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team ↵Michael Brasser2009-05-181-1/+1
|\ | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/opengl/qglpixmapfilter.cpp
| * Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-1/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-071-2/+1
|\ \ | | | | | | | | | kinetic-declarativeui
| * \ Merge branch '4.5'Thiago Macieira2009-05-071-2/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| | * | Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-2/+1
| | | | | | | | | | | | | | | | Reviewed-by: nrc
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-061-3/+2
|\ \ \ \ | |/ / / | | | | | | | | kinetic-declarativeui
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-3/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | * | Re-enabled antialiasing for large font sizes in OpenGL paint engine.Samuel Rødal2009-05-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.4 alphaMapForGlyph() would return valid images for any font size, but this was changed in 4.5, forcing us to use the path fallback instead. This lead to non-antialiased fonts when not using a multisample-enabled GL format. This patch re-introduces the alphaMapForGlyph() fallback in QFontEngine from 4.4 which uses the raster paint engine to draw the glyph. Task-number: 247083 Reviewed-by: Trond
* | | | Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team ↵Michael Brasser2009-05-062-72/+297
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: demos/boxes/scene.cpp src/opengl/qglpixmapfilter.cpp src/opengl/qglshaderprogram.cpp src/opengl/qglshaderprogram.h
| * | | qdoc fixesRhys Weatherley2009-05-011-12/+12
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-012-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-012-7/+35
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-012-2/+8
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-012-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-012-0/+142
| | | | | | | | | | | | | | | | Reviewed-by: Rhys Weatherley
| * | | Merge branch 'shaderprograms' of ↵Rhys Weatherley2009-05-018-206/+3420
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api Conflicts: src/gui/math3d/math3d.pri src/gui/math3d/qgenericmatrix.cpp src/gui/math3d/qgenericmatrix.h src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h src/gui/math3d/qquaternion.cpp src/gui/math3d/qquaternion.h src/gui/math3d/qvector2d.cpp src/gui/math3d/qvector2d.h src/gui/math3d/qvector3d.cpp src/gui/math3d/qvector3d.h src/gui/math3d/qvector4d.cpp src/gui/math3d/qvector4d.h src/opengl/opengl.pro tests/auto/math3d/math3d.pro tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp tests/auto/math3d/qquaternion/tst_qquaternion.cpp tests/auto/math3d/qvectornd/tst_qvectornd.cpp tests/auto/math3d/shared/math3dincludes.h
| | * | Fix loading of partial shaders from files.Rhys Weatherley2009-03-271-3/+0
| | | |
| | * | Bug in QGLShaderProgram::addShader() that stopped partial shaders working.Rhys Weatherley2009-03-271-3/+6
| | | |
| | * | Import shader implementation from before the history cut.Rhys Weatherley2009-03-238-208/+3422
| | | |
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-051-2/+10
|\ \ \ \ | |/ / / | | | | | | | | kinetic-declarativeui
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-2/+10
| |\ \ \ | | | |/ | | |/|
| | * | Get rid of an unnecessary image copy when grabbing a GL framebuffer.Trond Kjernåsen2009-04-291-2/+10
| | | | | | | | | | | | | | | | | | | | Task-number: Related to 241466 Reviewed-by: Samuel
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-282-1/+5
|\ \ \ \ | |/ / / | | | | | | | | kinetic-declarativeui
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-271-0/+4
| |\ \ \ | | |/ /
| | * | Fixes wrong QPaintEvent::region() in QGLWidget::paintEvent.Bjoern Erik Nilsen2009-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget does not support partial updates unless the context is single buffered and auto-fill background is disabled. The problem was that QPaintEvent::region() returned the requested update region without taking into account the limitation of QGLWidget. If QGLWidget doesn't support partial updates, it means everything has to be updated, and QPaintEvent::region() must return the whole widget rect. Auto test included. Task-number: 241785 Reviewed-by: Trond
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| | * | Compile fix for static builds on Windows for QtOpenGL apps.Denis Dzyubenko2009-04-221-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
* | | | Make compileMichael Brasser2009-04-221-3/+1
| | | | | | | | | | | | | | | | I've temporarily commented out the body of qguivariantanimation.cpp so we can compile.
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-222-55/+114
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5'Rhys Weatherley2009-04-211-2/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | Fix crash in OpenGL paint engine with hq antialiasing and TxProjectSamuel Rødal2009-04-211-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use painter paths instead of rectangles for perspective transformed rects, as the rectangles might have been clipped. Task-number: 251485 Reviewed-by: Trond
| | * | Reparenting QGLWidgets did sometimes caused warnings to be printed onTrond Kjernåsen2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac/Cocoa. Check if the view is visible before attaching it to a context. Task-number: related to 250066 Reviewed-by: Norwegian Rock Cat BT: yes
| | * | BT: OpenGL ES 2.0 now compiles properly for Windows CEThomas Hartmann2009-04-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform Reviewed-by: Tom Cooksey
| | * | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.Norwegian Rock Cat2009-04-153-23/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NSOpenGLContext seems to be tied to the window. So if the view changes from one window to another, the OpenGL context needs to be cleared. We can do this by hooking into the viewWillChangeWindow and viewDidChangeWindow events and clear and reset the drawable respectively. We also found out that QCocoaOpenGLView was not being used at all, so just remove it to get rid of any confusion. Task-number: 250066 Reviewed-by: Trond
| * | | Speed up texture uploads for hardware without n-pot-2 texture support.Trond Kjernåsen2009-04-201-53/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a manual fast scale, so that we can do a scale, swizzle and mirror in the same loop without any temporary image copies. This potentially increases texture uploads on embedded hw with a factor of 10. Reviewed-by: Samuel
* | | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-228-206/+3373
|/ / /
* | | Reparenting QGLWidgets did sometimes caused warnings to be printed onTrond Kjernåsen2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac/Cocoa. Check if the view is visible before attaching it to a context. Task-number: related to 250066 Reviewed-by: Norwegian Rock Cat BT: yes
* | | BT: OpenGL ES 2.0 now compiles properly for Windows CEThomas Hartmann2009-04-151-4/+6
| | | | | | | | | | | | | | | | | | glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform Reviewed-by: Tom Cooksey
* | | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.Norwegian Rock Cat2009-04-153-23/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NSOpenGLContext seems to be tied to the window. So if the view changes from one window to another, the OpenGL context needs to be cleared. We can do this by hooking into the viewWillChangeWindow and viewDidChangeWindow events and clear and reset the drawable respectively. We also found out that QCocoaOpenGLView was not being used at all, so just remove it to get rid of any confusion. Task-number: 250066 Reviewed-by: Trond
* | | Merge commit 'origin/4.5'Olivier Goffart2009-04-152-6/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | Fixes the composition demo for Mac/Cocoa in GL mode.Trond Kjernaasen2009-04-141-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLPixelBuffer::generateDynamicTexture() will bind the texture to the pbuffer regardless. Why this works on Carbon is a mystery, but if we're to follow our own docs, we should NOT bind the texture to the pbuffer by default. An explicit call to ::bindToDynamicTexture() is required for that. Task-number: 250664 Reviewed-by: Samuel BT: yes
| * | Update docs regarding sibling widgets ontop of QGLWidgets when Qt is builtTrond Kjernåsen2009-04-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with Cocoa support on Mac. The Cocoa API doesn't have a concept of Z-ordering of widgets, and it's implemented by reordering the widget hierarchy for normal widgets. This does unfortunately not work for GL widgets, and it's not supported by Apple. This apparently work with the Carbon AGL API though. Task-number: 244890 Reviewed-by: Gunnar Sletta BT: yes
| * | Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds workRhys Weatherley2009-04-075-25/+37
| | | | | | | | | | | | Reviewed-by: trustme
* | | Rename qIsFuzzyNull to qFuzzyIsNullBjoern Erik Nilsen2009-04-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function was added in fde7f3d03782c801901f511131458d6fcb1021a5 and we believe qFuzzyIsNull is a better naming and more in line with qFuzzyCompare. Reviewed-by: Lars Knoll Reviewed-by: nrc Reviewed-by: Samuel
* | | Use qIsFuzzyNull rather than the more expensive qFuzzyCompareBjoern Erik Nilsen2009-04-081-5/+4
| | | | | | | | | | | | | | | | | | | | | See also fde7f3d03782c801901f511131458d6fcb1021a5 Reviewed-by: Olivier Reviewed-by: Samuel
* | | Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds workRhys Weatherley2009-04-075-25/+37
| | | | | | | | | | | | Reviewed-by: trustme
* | | Merge branch '4.5'Thiago Macieira2009-04-031-1/+1
|\ \ \ | |/ /
| * | BT: Compilation on WinCE.Trond Kjernåsen2009-04-031-1/+1
| | | | | | | | | | | | Reviewed-by: Kim
* | | Merge branch '4.5'Thiago Macieira2009-03-271-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
generated by cgit v0.12 at 2024-10-25 19:26:48 (GMT)