Copy core GL functionality to QtGui with QGL -> QOpenGL naming.
authorSamuel Rødal <samuel.rodal@nokia.com>
Mon, 22 Aug 2011 08:49:28 +0000 (10:49 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Mon, 29 Aug 2011 08:25:24 +0000 (10:25 +0200)
commit6e28e8441b698c3397c2c78125c877f2e9867cb1
tree1e3ad0e43cb775854835817cd04bdc8b5e047e15
parentaaa4a26f82f99fa8724841eba91bad029306e0ce
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.

Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
205 files changed:
examples/opengl/hellowindow/hellowindow.cpp
examples/opengl/hellowindow/hellowindow.h
examples/opengl/hellowindow/hellowindow.pro
examples/opengl/opengl.pro
examples/opengl/paintedwindow/main.cpp [new file with mode: 0644]
examples/opengl/paintedwindow/paintedwindow.cpp [new file with mode: 0644]
examples/opengl/paintedwindow/paintedwindow.h [new file with mode: 0644]
examples/opengl/paintedwindow/paintedwindow.pro [new file with mode: 0644]
src/gui/egl/qegl_p.h
src/gui/egl/qegl_qpa.cpp
src/gui/egl/qeglcontext_p.h
src/gui/egl/qeglproperties_p.h
src/gui/gui.pro
src/gui/image/qpixmap.h
src/gui/image/qplatformpixmap.cpp
src/gui/image/qplatformpixmap_qpa.h
src/gui/kernel/kernel.pri
src/gui/kernel/qguiglcontext_qpa_p.h [deleted file]
src/gui/kernel/qopenglcontext.cpp [moved from src/gui/kernel/qguiglcontext_qpa.cpp with 60% similarity]
src/gui/kernel/qopenglcontext.h [moved from src/gui/kernel/qguiglcontext_qpa.h with 60% similarity]
src/gui/kernel/qopenglcontext_p.h [new file with mode: 0644]
src/gui/kernel/qplatformintegration_qpa.cpp
src/gui/kernel/qplatformintegration_qpa.h
src/gui/kernel/qplatformnativeinterface_qpa.cpp
src/gui/kernel/qplatformnativeinterface_qpa.h
src/gui/kernel/qplatformopenglcontext_qpa.cpp [moved from src/gui/kernel/qplatformglcontext_qpa.cpp with 63% similarity]
src/gui/kernel/qplatformopenglcontext_qpa.h [moved from src/gui/kernel/qplatformglcontext_qpa.h with 84% similarity]
src/gui/kernel/qplatformscreen_qpa.h
src/gui/kernel/qplatformwindow_qpa.cpp
src/gui/kernel/qplatformwindow_qpa.h
src/gui/kernel/qsurfaceformat.cpp
src/gui/kernel/qsurfaceformat.h
src/gui/kernel/qwindow.cpp
src/gui/opengl/opengl.pri [new file with mode: 0644]
src/gui/opengl/qopengl.cpp [new file with mode: 0644]
src/gui/opengl/qopengl.h [new file with mode: 0644]
src/gui/opengl/qopengl2pexvertexarray.cpp [new file with mode: 0644]
src/gui/opengl/qopengl2pexvertexarray_p.h [new file with mode: 0644]
src/gui/opengl/qopengl_p.h [new file with mode: 0644]
src/gui/opengl/qopenglbuffer.cpp [new file with mode: 0644]
src/gui/opengl/qopenglbuffer.h [new file with mode: 0644]
src/gui/opengl/qopenglcolormap.cpp [new file with mode: 0644]
src/gui/opengl/qopenglcolormap.h [new file with mode: 0644]
src/gui/opengl/qopenglcustomshaderstage.cpp [new file with mode: 0644]
src/gui/opengl/qopenglcustomshaderstage_p.h [new file with mode: 0644]
src/gui/opengl/qopenglengineshadermanager.cpp [new file with mode: 0644]
src/gui/opengl/qopenglengineshadermanager_p.h [new file with mode: 0644]
src/gui/opengl/qopenglengineshadersource_p.h [new file with mode: 0644]
src/gui/opengl/qopenglextensions_p.h [new file with mode: 0644]
src/gui/opengl/qopenglframebufferobject.cpp [new file with mode: 0644]
src/gui/opengl/qopenglframebufferobject.h [new file with mode: 0644]
src/gui/opengl/qopenglframebufferobject_p.h [new file with mode: 0644]
src/gui/opengl/qopenglfunctions.cpp [new file with mode: 0644]
src/gui/opengl/qopenglfunctions.h [new file with mode: 0644]
src/gui/opengl/qopenglgradientcache.cpp [new file with mode: 0644]
src/gui/opengl/qopenglgradientcache_p.h [new file with mode: 0644]
src/gui/opengl/qopenglpaintdevice.cpp [new file with mode: 0644]
src/gui/opengl/qopenglpaintdevice_p.h [new file with mode: 0644]
src/gui/opengl/qopenglshadercache_meego_p.h [new file with mode: 0644]
src/gui/opengl/qopenglshadercache_p.h [moved from src/opengl/util/meego/main.cpp with 58% similarity]
src/gui/opengl/qopenglshaderprogram.cpp [new file with mode: 0644]
src/gui/opengl/qopenglshaderprogram.h [new file with mode: 0644]
src/gui/opengl/qpaintengineex_opengl2.cpp [new file with mode: 0644]
src/gui/opengl/qpaintengineex_opengl2_p.h [new file with mode: 0644]
src/gui/opengl/qrbtree_p.h [new file with mode: 0644]
src/gui/opengl/qtextureglyphcache_gl.cpp [new file with mode: 0644]
src/gui/opengl/qtextureglyphcache_gl_p.h [new file with mode: 0644]
src/gui/opengl/qtriangulatingstroker.cpp [new file with mode: 0644]
src/gui/opengl/qtriangulatingstroker_p.h [new file with mode: 0644]
src/gui/opengl/qtriangulator.cpp [new file with mode: 0644]
src/gui/opengl/qtriangulator_p.h [new file with mode: 0644]
src/gui/painting/qpaintengine.cpp
src/gui/painting/qpaintengineex_p.h
src/gui/painting/qpainter.cpp
src/gui/text/qfont.h
src/gui/text/qglyphrun.h
src/gui/text/qglyphrun_p.h
src/gui/text/qstatictext.cpp
src/modules/qt_gui.pri
src/opengl/gl2paintengineex/qglengineshadermanager.cpp
src/opengl/gl2paintengineex/qglgradientcache.cpp
src/opengl/gl2paintengineex/qglgradientcache_p.h
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/opengl/gl2paintengineex/qtriangulator_p.h
src/opengl/qgl.cpp
src/opengl/qgl.h
src/opengl/qgl_p.h
src/opengl/qgl_qpa.cpp
src/opengl/qglbuffer.cpp
src/opengl/qglextensions_p.h
src/opengl/qglframebufferobject.cpp
src/opengl/qglfunctions.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
src/opengl/util/README-GLSL [deleted file]
src/opengl/util/brush_painter.glsl [deleted file]
src/opengl/util/brushes.conf [deleted file]
src/opengl/util/composition_mode_colorburn.glsl [deleted file]
src/opengl/util/composition_mode_colordodge.glsl [deleted file]
src/opengl/util/composition_mode_darken.glsl [deleted file]
src/opengl/util/composition_mode_difference.glsl [deleted file]
src/opengl/util/composition_mode_exclusion.glsl [deleted file]
src/opengl/util/composition_mode_hardlight.glsl [deleted file]
src/opengl/util/composition_mode_lighten.glsl [deleted file]
src/opengl/util/composition_mode_multiply.glsl [deleted file]
src/opengl/util/composition_mode_overlay.glsl [deleted file]
src/opengl/util/composition_mode_screen.glsl [deleted file]
src/opengl/util/composition_mode_softlight.glsl [deleted file]
src/opengl/util/composition_modes.conf [deleted file]
src/opengl/util/conical_brush.glsl [deleted file]
src/opengl/util/ellipse_aa.glsl [deleted file]
src/opengl/util/fast_painter.glsl [deleted file]
src/opengl/util/fragmentprograms_p.h [deleted file]
src/opengl/util/generator.cpp [deleted file]
src/opengl/util/generator.pro [deleted file]
src/opengl/util/glsl_to_include.sh [deleted file]
src/opengl/util/linear_brush.glsl [deleted file]
src/opengl/util/masks.conf [deleted file]
src/opengl/util/meego/shader-cache-introspector.pro [deleted file]
src/opengl/util/painter.glsl [deleted file]
src/opengl/util/painter_nomask.glsl [deleted file]
src/opengl/util/pattern_brush.glsl [deleted file]
src/opengl/util/radial_brush.glsl [deleted file]
src/opengl/util/simple_porter_duff.glsl [deleted file]
src/opengl/util/solid_brush.glsl [deleted file]
src/opengl/util/texture_brush.glsl [deleted file]
src/opengl/util/trap_exact_aa.glsl [deleted file]
src/platformsupport/eglconvenience/qeglplatformcontext.cpp
src/platformsupport/eglconvenience/qeglplatformcontext_p.h
src/plugins/platforms/cocoa/qcocoaglcontext.h
src/plugins/platforms/cocoa/qcocoaglcontext.mm
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoaintegration.mm
src/plugins/platforms/directfb/qdirectfbglcontext.cpp
src/plugins/platforms/directfb/qdirectfbglcontext.h
src/plugins/platforms/directfb/qdirectfbwindow.cpp
src/plugins/platforms/eglfs/qeglfsbackingstore.cpp
src/plugins/platforms/eglfs/qeglfsintegration.cpp
src/plugins/platforms/eglfs/qeglfsintegration.h
src/plugins/platforms/eglfs/qeglfsscreen.cpp
src/plugins/platforms/eglfs/qeglfsscreen.h
src/plugins/platforms/kms/qkmscontext.cpp
src/plugins/platforms/kms/qkmscontext.h
src/plugins/platforms/kms/qkmsintegration.cpp
src/plugins/platforms/kms/qkmsintegration.h
src/plugins/platforms/openkode/qopenkodeintegration.h
src/plugins/platforms/openkode/qopenkodewindow.cpp
src/plugins/platforms/openkode/qopenkodewindow.h
src/plugins/platforms/openwfd/qopenwfdglcontext.cpp
src/plugins/platforms/openwfd/qopenwfdglcontext.h
src/plugins/platforms/openwfd/qopenwfdintegration.cpp
src/plugins/platforms/openwfd/qopenwfdintegration.h
src/plugins/platforms/openwfd/qopenwfdnativeinterface.cpp
src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
src/plugins/platforms/uikit/quikitwindow.h
src/plugins/platforms/uikit/quikitwindow.mm
src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h
src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglcontext.cpp
src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglcontext.h
src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglintegration.cpp
src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglintegration.h
src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.h
src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.cpp
src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.h
src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.cpp
src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.h
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.h
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.cpp
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.h
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.h
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.h
src/plugins/platforms/wayland/qwaylandintegration.cpp
src/plugins/platforms/wayland/qwaylandintegration.h
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/plugins/platforms/windows/qwindowsglcontext.h
src/plugins/platforms/windows/qwindowsintegration.cpp
src/plugins/platforms/windows/qwindowsintegration.h
src/plugins/platforms/xcb/qdri2context.cpp
src/plugins/platforms/xcb/qdri2context.h
src/plugins/platforms/xcb/qglxintegration.cpp
src/plugins/platforms/xcb/qglxintegration.h
src/plugins/platforms/xcb/qxcbintegration.cpp
src/plugins/platforms/xcb/qxcbintegration.h
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.h
src/plugins/platforms/xlib/qglxintegration.cpp
src/plugins/platforms/xlib/qglxintegration.h
src/plugins/platforms/xlib/qxlibintegration.cpp
src/plugins/platforms/xlib/qxlibintegration.h
src/plugins/platforms/xlib/qxlibwindow.h
src/tools/uic/qclass_lib_map.h
src/widgets/kernel/qwidget_qpa.cpp