← Back to branch summary

~zsombi/ubuntu-ui-toolkit/listitemSelectModeBugs

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/plugin/ucubuntushape.cpp

  • Committer: Zsombor Egri
  • Date: 2015-11-16 06:35:05 UTC
  • mfrom: (1664.1.1 listitemSelectModeBugs)
  • Revision ID: zsombor.egri@canonical.com-20151116063505-cwn2qfks7qzk10g9
re-sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/plugin/ucubuntushape.cpp
34
34
#include <QtGui/QScreen>
35
35
#include <QtQuick/QQuickWindow>
36
36
#include <QtQuick/QSGTextureProvider>
 
37
#define emit Q_EMIT
37
38
#include <QtQuick/private/qquickimage_p.h>
 
39
#undef emit
38
40
#include <QtQuick/private/qsgadaptationlayer_p.h>
39
41
#include <QtQml/qqmlinfo.h>
40
42
#include <math.h>
1103
1105
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1104
1106
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
1105
1107
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
1106
 
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, shapeTextureMipmapCount - 1);
1107
1108
            for (int j = 0; j < shapeTextureMipmapCount; j++) {
1108
1109
                glTexImage2D(GL_TEXTURE_2D, j, GL_RGBA, shapeTextureMipmapWidth >> j,
1109
1110
                             shapeTextureMipmapHeight >> j, 0, GL_RGBA, GL_UNSIGNED_BYTE,