1
=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
2
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-04-08 18:41:31 +0000
3
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-05-09 08:10:26 +0000
4
@@ -32,6 +32,9 @@
5
32
// Threshold in grid unit defining the texture quality to be used.
32
// Threshold in grid unit defining the texture quality to be used.
6
33
const float lowHighTextureThreshold = 11.0f;
33
const float lowHighTextureThreshold = 11.0f;
7
34
34
8
35
// Map of windows and associated textures.
9
36
QHash<QOpenGLContext*, ShapeItem::TextureHandles> ShapeItem::textures_;
10
37
11
35
static const char* const shapeVertexShader =
38
static const char* const shapeVertexShader =
12
36
    "uniform lowp mat4 matrix;                  \n"
39
    "uniform lowp mat4 matrix;                  \n"
13
37
    "attribute lowp vec4 positionAttrib;        \n"
40
    "attribute lowp vec4 positionAttrib;        \n"
14
@@ -338,6 +341,21 @@
15
338
    update();
341
    update();
16
339
}
342
}
17
340
343
18
344
void ShapeItem::onOpenglContextDestroyed()
19
345
{
20
346
    QOpenGLContext* context = qobject_cast<QOpenGLContext*>(sender());
21
347
    if (Q_UNLIKELY(!context)) return;
22
348
23
349
    QHash<QOpenGLContext*, TextureHandles>::iterator it =
24
350
        textures_.find(context);
25
351
    if (it != textures_.end()) {
26
352
        TextureHandles &textureHandles = it.value();
27
353
        delete textureHandles.high;
28
354
        delete textureHandles.low;
29
355
        textures_.erase(it);
30
356
    }
31
357
}
32
358
33
341
QSGNode* ShapeItem::updatePaintNode(QSGNode* old_node, UpdatePaintNodeData* data)
359
QSGNode* ShapeItem::updatePaintNode(QSGNode* old_node, UpdatePaintNodeData* data)
34
342
{
360
{
35
343
    Q_UNUSED(data);
361
    Q_UNUSED(data);
36
@@ -345,19 +363,28 @@
37
345
    // FIXME(loicm) Shape textures are stored in the read-only data section of the plugin as it
363
    // FIXME(loicm) Shape textures are stored in the read-only data section of the plugin as it
38
346
    //     avoids having to deal with paths for now. It should preferably be loaded from a file.
364
    //     avoids having to deal with paths for now. It should preferably be loaded from a file.
39
347
365
47
348
    /* Textures created with QWindow::createTextureFromImage() become invalid
366
    // OpenGL allocates textures per context, so we store textures reused by
48
349
     * when the window is destroyed; therefore, we must keep track of which
367
    // all shape instances per context as well
49
350
     * window was used to create them and be ready to re-create them if that
368
    QOpenGLContext* openglContext = window() ? window()->openglContext() : NULL;
50
351
     * window goes away. */
369
    if (Q_UNLIKELY(!openglContext)) {
51
352
    static QPointer<QWindow> textureOwner = 0;
370
        qCritical() << "Window has no GL context!";
52
353
    if (!textureOwner) {
371
        delete old_node;
53
354
        shapeTextureHigh.texture = window()->createTextureFromImage(
372
        return NULL;
54
373
    }
55
374
56
375
    TextureHandles &textureHandles = textures_[openglContext];
57
376
    // If the hash table didn't contain an entry for the current context, the
58
377
    // line above has just caused the creation of a default-constructed value.
59
378
    if (!textureHandles.high) {
60
379
        textureHandles.high = window()->createTextureFromImage(
61
355
            QImage(shapeTextureHigh.data, shapeTextureHigh.width, shapeTextureHigh.height,
380
            QImage(shapeTextureHigh.data, shapeTextureHigh.width, shapeTextureHigh.height,
62
356
                   QImage::Format_ARGB32_Premultiplied));
381
                   QImage::Format_ARGB32_Premultiplied));
64
357
        shapeTextureLow.texture = window()->createTextureFromImage(
382
        textureHandles.low = window()->createTextureFromImage(
65
358
            QImage(shapeTextureLow.data, shapeTextureLow.width, shapeTextureLow.height,
383
            QImage(shapeTextureLow.data, shapeTextureLow.width, shapeTextureLow.height,
66
359
                   QImage::Format_ARGB32_Premultiplied));
384
                   QImage::Format_ARGB32_Premultiplied));
68
360
        textureOwner = window();
385
        QObject::connect(openglContext, SIGNAL(aboutToBeDestroyed()),
69
386
                         this, SLOT(onOpenglContextDestroyed()),
70
387
                         Qt::DirectConnection);
71
361
    }
388
    }
72
362
389
73
363
    // The image item sets its texture in its updatePaintNode() method when QtQuick iterates through
390
    // The image item sets its texture in its updatePaintNode() method when QtQuick iterates through
74
@@ -387,8 +414,15 @@
75
387
414
76
388
    ShapeTexturedMaterial* texturedMaterial = node->texturedMaterial();
415
    ShapeTexturedMaterial* texturedMaterial = node->texturedMaterial();
77
389
    ShapeColoredMaterial* coloredMaterial = node->coloredMaterial();
416
    ShapeColoredMaterial* coloredMaterial = node->coloredMaterial();
80
390
    TextureData* textureData = (gridUnit_ > lowHighTextureThreshold) ?
417
    TextureData* textureData;
81
391
        &shapeTextureHigh : &shapeTextureLow;
418
    QSGTexture* textureHandle;
82
419
    if (gridUnit_ > lowHighTextureThreshold) {
83
420
        textureData = &shapeTextureHigh;
84
421
        textureHandle = textureHandles.high;
85
422
    } else {
86
423
        textureData = &shapeTextureLow;
87
424
        textureHandle = textureHandles.low;
88
425
    }
89
392
426
90
393
    // Set the shape texture to be used by the materials depending on current grid unit. The radius
427
    // Set the shape texture to be used by the materials depending on current grid unit. The radius
91
394
    // is set considering the current grid unit and the texture raster grid unit. When the item size
428
    // is set considering the current grid unit and the texture raster grid unit. When the item size
92
@@ -406,8 +440,8 @@
93
406
        radius = halfMinWidthHeight;
440
        radius = halfMinWidthHeight;
94
407
        scaledDown |= 1;
441
        scaledDown |= 1;
95
408
    }
442
    }
98
409
    coloredMaterial->setShapeTexture(textureData->texture, !!scaledDown);
443
    coloredMaterial->setShapeTexture(textureHandle, !!scaledDown);
99
410
    texturedMaterial->setShapeTexture(textureData->texture, !!scaledDown);
444
    texturedMaterial->setShapeTexture(textureHandle, !!scaledDown);
100
411
445
101
412
    // Update the other material properties.
446
    // Update the other material properties.
102
413
    coloredMaterial->setColor(color_);
447
    coloredMaterial->setColor(color_);
103
414
448
104
=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.h'
105
--- modules/Ubuntu/Components/plugin/shapeitem.h	2013-10-18 08:56:39 +0000
106
+++ modules/Ubuntu/Components/plugin/shapeitem.h	2014-05-09 08:10:26 +0000
107
@@ -91,6 +91,7 @@
108
91
91
109
92
private Q_SLOTS:
92
private Q_SLOTS:
110
93
    void onImagePropertiesChanged();
93
    void onImagePropertiesChanged();
111
94
    void onOpenglContextDestroyed();
112
94
95
113
95
private:
96
private:
114
96
    enum DirtyFlags {
97
    enum DirtyFlags {
115
@@ -110,6 +111,12 @@
116
110
                              | DirtyGridUnit | DirtyGeometry)
111
                              | DirtyGridUnit | DirtyGeometry)
117
111
    };
112
    };
118
112
113
119
114
    struct TextureHandles {
120
115
        TextureHandles(): high(0), low(0) {}
121
116
        QSGTexture* high;
122
117
        QSGTexture* low;
123
118
    };
124
119
125
113
    QColor color_;
120
    QColor color_;
126
114
    QColor gradientColor_;
121
    QColor gradientColor_;
127
115
    bool gradientColorSet_;
122
    bool gradientColorSet_;
128
@@ -124,6 +131,7 @@
129
124
    float gridUnit_;
131
    float gridUnit_;
130
125
    QRectF geometry_;
132
    QRectF geometry_;
131
126
    QFlags<DirtyFlags> dirtyFlags_;
133
    QFlags<DirtyFlags> dirtyFlags_;
132
134
    static QHash<QOpenGLContext*, TextureHandles> textures_;
133
127
135
134
128
    Q_DISABLE_COPY(ShapeItem)
136
    Q_DISABLE_COPY(ShapeItem)
135
129
};
137
};
136
130
138
137
=== modified file 'modules/Ubuntu/Components/plugin/shapeitemtexture.h'
138
--- modules/Ubuntu/Components/plugin/shapeitemtexture.h	2013-01-07 07:59:56 +0000
139
+++ modules/Ubuntu/Components/plugin/shapeitemtexture.h	2014-05-09 08:10:26 +0000
140
@@ -20,7 +20,6 @@
141
20
20
142
21
struct TextureData {
21
struct TextureData {
143
22
    const unsigned char* const data;
22
    const unsigned char* const data;
144
23
    QSGTexture* texture;
145
24
    int width;
23
    int width;
146
25
    int height;
24
    int height;
147
26
    int bytesPerPixel;
25
    int bytesPerPixel;
148
@@ -5160,7 +5159,7 @@
149
5160
5159
150
5161
// High resolution shape texture.
5160
// High resolution shape texture.
151
5162
TextureData shapeTextureHigh __attribute__((aligned(16))) = {
5161
TextureData shapeTextureHigh __attribute__((aligned(16))) = {
153
5163
    shapeTextureHighData, NULL, 256, 128, 4, 32.0f, 64.0f, 18.0f,
5162
    shapeTextureHighData, 256, 128, 4, 32.0f, 64.0f, 18.0f,
154
5164
    {
5163
    {
155
5165
        {  // Medium raw coords.
5164
        {  // Medium raw coords.
156
5166
            { hh, 0.0f }, { 0.25f-hh, 0.0f }, { 0.25f-hh, 0.0f }, { hh, 0.0f },
5165
            { hh, 0.0f }, { 0.25f-hh, 0.0f }, { 0.25f-hh, 0.0f }, { hh, 0.0f },
157
@@ -6484,7 +6483,7 @@
158
6484
6483
159
6485
// Low resolution shape texture.
6484
// Low resolution shape texture.
160
6486
TextureData shapeTextureLow __attribute__((aligned(16))) = {
6485
TextureData shapeTextureLow __attribute__((aligned(16))) = {
162
6487
    shapeTextureLowData, NULL, 128, 64, 4, 16.0f, 32.0f, 9.0f,
6486
    shapeTextureLowData, 128, 64, 4, 16.0f, 32.0f, 9.0f,
163
6488
    {
6487
    {
164
6489
        {  // Medium raw coords.
6488
        {  // Medium raw coords.
165
6490
            { hl, 0.0f }, { 0.25f-hl, 0.0f }, { 0.25f-hl, 0.0f }, { hl, 0.0f },
6489
            { hl, 0.0f }, { 0.25f-hl, 0.0f }, { 0.25f-hl, 0.0f }, { hl, 0.0f },
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-05-07	Approve on 2014-05-20
Loïc Molinari (community)		2014-05-07	Approve on 2014-05-20
Review via email: mp+218617@code.launchpad.net