1. 29 Jun, 2015 - 1 commit
  2. 26 Jun, 2015 - 1 commit
  3. 17 Jun, 2015 - 1 commit
  4. 11 Jun, 2015 - 1 commit
  5. 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
  6. 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
  7. 03 Jun, 2015 - 1 commit
  8. 01 Jun, 2015 - 6 commits
  9. 29 May, 2015 - 2 commits
  10. 28 May, 2015 - 3 commits
  11. 27 May, 2015 - 8 commits
  12. 26 May, 2015 - 8 commits
  13. 22 May, 2015 - 2 commits
  14. 21 May, 2015 - 2 commits
  15. 20 May, 2015 - 2 commits
    • Miikka Heikkinen's avatar
      Actual fix for "shaking" bug that occurred in some GPUs · 3e14de57
      Miikka Heikkinen authored
      
      The first FBO we create gets corrupted by something outside
      Canvas3D in some cases. E.g. changing the text in an completely unrelated
      Text element may corrupt Canvas3D FBOs. This only happens with some GPU
      drivers, likely due to a bug in the drivers themselves. To work around
      the issue, the first FBO we create is a dummy that we delete once the
      real FBOs are done.
      
      Change-Id: Ie8c2a0ec3899c3eb22e4de8809c3b41607cc83c3
      Task-number: QTBUG-46101
      Reviewed-by: default avatarPasi Keränen <pasi.keranen@digia.com>
      3e14de57
    • Miikka Heikkinen's avatar
      Fix depth enum usage. · 75359f75
      Miikka Heikkinen authored
      
      Fix depth enum usage in examples.
      Remove the TODO comment about depth enums being commented out.
      They are commented out because stencil defines the same enums.
      
      Change-Id: I516b60f36a54775e5af504e70e9e9dab9fe5ab54
      Reviewed-by: default avatarPasi Keränen <pasi.keranen@digia.com>
      75359f75