Fix merge conflicts
Description
Description
Details
Details
- Committed
Nim Aug 26 2016, 7:38 AM - Parents
- R37:d6a69a33c7bd: Merge branch 'master' of git://anongit.kde.org/krita into nimmy-opengl3
R37:5fee1c403bd8: Commented out legacy GL code - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 5fee1c403bd8 | Nim | Commented out legacy GL code | Aug 25 2016 | |||
| 3f04716f2735 | Nim | Updated paintengine to mirror Qt patch | Aug 25 2016 | |||
| 5b6ae132b8a6 | Nim | Merge branch 'master' into nimmy-opengl3 | Aug 23 2016 | |||
| ee41757f846c | Nim | Merge remote-tracking branch 'origin/master' into nimmy-opengl3 | Jul 29 2016 | |||
| c0b2fd59f8ee | Nim | Merge remote-tracking branch 'origin/master' into nimmy-opengl3 | Jul 20 2016 | |||
| 89cc35755833 | rempt | Fix two warnings | Jul 14 2016 | |||
| 09b9f4edfcb0 | Nim | Added timer to render tests | Jul 10 2016 | |||
| 1b8522a84808 | Nim | Added tests for 13 functions in QPainter | Jul 8 2016 | |||
| 4e5d42b45ee2 | Nim | Updated QOpenGLPaintEngine class to Qt 5.7.0 | Jul 6 2016 | |||
| 9e74bf6d79de | Nim | Updated QOpenGLVertexArrayObject class to Qt 5.7.0 | Jul 6 2016 | |||
| 21718b89e303 | Nim | Updated QOpenGLWidget class to Qt 5.7.0 | Jul 6 2016 | |||
| 6bb13d953e87 | Nim | Updated QOpenGLTextureHelper class to Qt 5.7.0 | Jul 6 2016 | |||
| f9476314537e | Nim | Updated QTriangulatingStroker class to Qt 5.7.0 | Jul 6 2016 | |||
| a18425beaba1 | Nim | Removed QRbTree private file | Jul 6 2016 | |||
| 12e22fa991cb | Nim | Updated QTriangular class to Qt 5.7.0 | Jul 6 2016 | |||
| f7a9598b04a2 | Nim | Updated QRGBA64 class to Qt 5.7.0 | Jul 6 2016 | |||
| 166975862351 | Nim | Updated QOpenGLTextureGlyphCache class to Qt 5.7.0 | Jul 6 2016 | |||
| 1b19b21d2211 | Nim | Updated QOpenGLTextureBlitter class to Qt 5.7.0 | Jul 6 2016 | |||
| d88dc6a3315a | Nim | Updated QOpenGLShaderCache class to Qt 5.7.0 | Jul 6 2016 | |||
| 22006a0b72a6 | Nim | Updated QOpenGLShaderCache_Meego class to Qt 5.7.0 | Jul 6 2016 | |||
| 2087f126e963 | Nim | Updated QOpenGLQueryHelper class to Qt 5.7.0 | Jul 6 2016 | |||
| b2f9b872fc70 | Nim | Updated QOpenGLTextureCache class to Qt 5.7.0 | Jul 6 2016 | |||
| eac9d11ac0e9 | Nim | Updated QOpenGLPaintDevice class to Qt 5.7.0 | Jul 6 2016 | |||
| 1bbce59244d4 | Nim | Updated QOpenGLGradientCache class to Qt 5.7.0 | Jul 6 2016 | |||
| a4bb2c4c536c | Nim | Updated QOpenGLFramebufferObjectPrivate class to Qt 5.7.0 | Jul 6 2016 | |||
| 68d99c759a16 | Nim | Updated QOpenGLExtensions class to Qt 5.7.0 | Jul 6 2016 | |||
| 4d5be97e1775 | Nim | Updated QOpenGLEngineShaderSourcePrivate class to Qt 5.7.0 | Jul 6 2016 | |||
| 0f061d5dfa43 | Nim | Updated QOpenGLEngineShaderManager class to Qt 5.7.0 | Jul 6 2016 | |||
| f0bff5183de5 | Nim | Updated QOpenGLCustomShaderStage class to Qt 5.7.0 | Jul 6 2016 | |||
| d182a64d61ca | Nim | Updated QOpenGL2PEXVertexArray class to Qt 5.7.0 | Jul 6 2016 | |||
| 415c3df4e053 | Nim | Merge remote-tracking branch 'origin' into nimmy-opengl3 | Jul 5 2016 | |||
| f9009fe7b619 | Nim | Added proper sizes to setVertexAttributePointer calls | Jul 1 2016 | |||
| 711b82025a57 | Nim | Merge remote-tracking branch 'origin/master' into nimmy-opengl3 | Jun 30 2016 | |||
| 475033428a7e | Nim | Moved all allocation to setVertexAttributePointer | Jun 30 2016 | |||
| 9097c27ff2ba | Nim | Fixed perspective assistant | Jun 28 2016 | |||
| 0e13899d6f16 | Nim | Debug to figure out beelzy bug | Jun 25 2016 | |||
| 2465883f27b0 | Nim | Fixed unknown metric 12 warning | Jun 23 2016 | |||
| 725a32fc7ce0 | Nim | Split canvas VAO in two, one for drawing quads, one for drawing outlines | Jun 23 2016 | |||
| 05e9618917a7 | Nim | Fixed mistakenly writing to the wrong buffer object | Jun 22 2016 | |||
| 9eda772a5d5f | Nim | Made the painting of the tool outlines faster | Jun 22 2016 | |||
| 4759b6da0720 | Nim | Changed glVertexAttribPointer to always use 0 offset | Jun 22 2016 | |||
| f0847c20c192 | Nim | Cleaned up artifacts left behind from debugging | Jun 22 2016 | |||
| 747734d3089e | Nim | Merge remote-tracking branch 'origin' into nimmy-opengl3 | Jun 17 2016 | |||
| 3c0da0e59f3f | Nim | Added vao and vbo destruction to ~QOpenGL2PaintEngineExPrivate | Jun 17 2016 | |||
| 468c6c64197c | Nim | Refraining from creating new VAO/VBOs when they already exist | Jun 17 2016 | |||
| 011e77caf23f | Nim | Moved paint engine buffer object to the stack and its creation to begin() | Jun 17 2016 | |||
| 9005ecbeba62 | Nim | Moved paint engine vertex array to the stack | Jun 16 2016 | |||
| bdcb9f7a370f | Nim | Unrolled creation loop of VBOs to allow different draw behaviours | Jun 16 2016 | |||
| 8b4ca659ce90 | Nim | Replaced all vboHandles with QOpenGLBuffer objects | Jun 16 2016 | |||
| 4a07fe03c709 | Nim | Replaced vboHandle[0] with QOpenGLBuffer object | Jun 16 2016 |