1. 01 Jul, 2015 - 2 commits
  2. 29 Jun, 2015 - 4 commits
  3. 26 Jun, 2015 - 1 commit
  4. 17 Jun, 2015 - 1 commit
  5. 11 Jun, 2015 - 1 commit
  6. 08 Jun, 2015 - 1 commit
    • Miikka Heikkinen's avatar
      Merge remote-tracking branch 'origin/dev' into wip/threading · 5b5282c9
      Miikka Heikkinen authored
      Conflicts:
      	src/imports/qtcanvas3d/canvas3d.cpp
      	src/imports/qtcanvas3d/context3d.cpp
      	src/imports/qtcanvas3d/context3d_p.h
      	src/imports/qtcanvas3d/framebuffer3d.cpp
      	src/imports/qtcanvas3d/framebuffer3d_p.h
      	src/imports/qtcanvas3d/program3d.cpp
      	src/imports/qtcanvas3d/uniformlocation.cpp
      	src/imports/qtcanvas3d/uniformlocation_p.h
      
      Change-Id: I214239d40936e14dd69498167b08f199a692f325
      5b5282c9
  7. 04 Jun, 2015 - 1 commit
    • Miikka Heikkinen's avatar
      Execute Canvas3D OpenGL in render thread · 5a861acb
      Miikka Heikkinen authored
      
      The render loop has been redesigned.
      The OpenGL commands are queued instead of executed immediately.
      updatePaintNode() now transfers the commands to the renderer,
      which implements all OpenGL related things that used to be in
      the Canvas class. The actual rendering is done in response to
      beforeRendering signal in the render thread.
      
      [ChangeLog][Renderer] OpenGL rendering moved to render thread.
      
      Task-number: QTBUG-44953
      Change-Id: Ibd5897e64b84b6c7ce169cece8293381eca94ab9
      Reviewed-by: default avatarTomi Korpipää <tomi.korpipaa@theqtcompany.com>
      Reviewed-by: default avatarPasi Keränen <pasi.keranen@digia.com>
      5a861acb
  8. 03 Jun, 2015 - 1 commit
  9. 01 Jun, 2015 - 6 commits
  10. 29 May, 2015 - 2 commits
  11. 28 May, 2015 - 3 commits
  12. 27 May, 2015 - 8 commits
  13. 26 May, 2015 - 8 commits
  14. 22 May, 2015 - 1 commit