diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch index 0dbee0b4..bd5cfacd 100644 --- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4772fd9332b7c71543d058c1e1cfa24399a9f269 Mon Sep 17 00:00:00 2001 | 1 | From a2a195bc2782ccf582afb00ffc25021abd2ba810 Mon Sep 17 00:00:00 2001 |
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | 2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> |
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | 3 | Date: Thu, 16 May 2013 09:52:07 +0300 |
4 | Subject: [PATCH 6/9] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 06/10] QOpenGLPaintDevice sub-area support |
5 | 5 | ||
6 | Allows creating QOpenGLPaintDevice targetting sub-area | 6 | Allows creating QOpenGLPaintDevice targetting sub-area |
7 | of binded framebuffer. | 7 | of binded framebuffer. |
@@ -81,10 +81,10 @@ index 54ea092..f660143 100644 | |||
81 | 81 | ||
82 | qreal dpmx; | 82 | qreal dpmx; |
83 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp | 83 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp |
84 | index 4836dde..3f99b16 100644 | 84 | index 0b92bf4..f41e059 100644 |
85 | --- a/src/gui/opengl/qopenglpaintengine.cpp | 85 | --- a/src/gui/opengl/qopenglpaintengine.cpp |
86 | +++ b/src/gui/opengl/qopenglpaintengine.cpp | 86 | +++ b/src/gui/opengl/qopenglpaintengine.cpp |
87 | @@ -2091,7 +2091,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) | 87 | @@ -2078,7 +2078,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) |
88 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) | 88 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) |
89 | d->vertexAttributeArraysEnabledState[i] = false; | 89 | d->vertexAttributeArraysEnabledState[i] = false; |
90 | 90 | ||
@@ -95,7 +95,7 @@ index 4836dde..3f99b16 100644 | |||
95 | d->width = sz.width(); | 95 | d->width = sz.width(); |
96 | d->height = sz.height(); | 96 | d->height = sz.height(); |
97 | d->mode = BrushDrawingMode; | 97 | d->mode = BrushDrawingMode; |
98 | @@ -2178,7 +2181,7 @@ void QOpenGL2PaintEngineEx::ensureActive() | 98 | @@ -2165,7 +2168,7 @@ void QOpenGL2PaintEngineEx::ensureActive() |
99 | d->device->ensureActiveTarget(); | 99 | d->device->ensureActiveTarget(); |
100 | 100 | ||
101 | d->transferMode(BrushDrawingMode); | 101 | d->transferMode(BrushDrawingMode); |
@@ -104,7 +104,7 @@ index 4836dde..3f99b16 100644 | |||
104 | d->needsSync = false; | 104 | d->needsSync = false; |
105 | d->shaderManager->setDirty(); | 105 | d->shaderManager->setDirty(); |
106 | d->syncGlState(); | 106 | d->syncGlState(); |
107 | @@ -2220,6 +2223,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 107 | @@ -2207,6 +2210,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
108 | if (bounds == QRect(0, 0, width, height)) { | 108 | if (bounds == QRect(0, 0, width, height)) { |
109 | funcs.glDisable(GL_SCISSOR_TEST); | 109 | funcs.glDisable(GL_SCISSOR_TEST); |
110 | } else { | 110 | } else { |
@@ -112,7 +112,7 @@ index 4836dde..3f99b16 100644 | |||
112 | funcs.glEnable(GL_SCISSOR_TEST); | 112 | funcs.glEnable(GL_SCISSOR_TEST); |
113 | setScissor(bounds); | 113 | setScissor(bounds); |
114 | } | 114 | } |
115 | @@ -2228,12 +2232,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 115 | @@ -2215,12 +2219,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
116 | 116 | ||
117 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) | 117 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) |
118 | { | 118 | { |
@@ -128,7 +128,7 @@ index 4836dde..3f99b16 100644 | |||
128 | 128 | ||
129 | funcs.glScissor(left, bottom, width, height); | 129 | funcs.glScissor(left, bottom, width, height); |
130 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h | 130 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h |
131 | index 17be72b..43e88f6 100644 | 131 | index f1ec669..6d302b8 100644 |
132 | --- a/src/gui/opengl/qopenglpaintengine_p.h | 132 | --- a/src/gui/opengl/qopenglpaintengine_p.h |
133 | +++ b/src/gui/opengl/qopenglpaintengine_p.h | 133 | +++ b/src/gui/opengl/qopenglpaintengine_p.h |
134 | @@ -264,6 +264,7 @@ public: | 134 | @@ -264,6 +264,7 @@ public: |
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644 | |||
153 | } else { | 153 | } else { |
154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
155 | -- | 155 | -- |
156 | 2.6.2 | 156 | 2.7.1 |
157 | 157 | ||