diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:36:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:36:57 +0200 |
| commit | c704226b6815df4d989142729bae9fadd14f6f9d (patch) | |
| tree | 4df1121d070b43bd20af27c8f0018e9ced2cf0f9 /src/particles/qquickimageparticle.cpp | |
| parent | b0c8debfd19ea5752066cb4b933d504b2fa220c5 (diff) | |
| parent | 3e3b5709025d3564215cfca4f9aa5da95742a61f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I8b0be891402530e38efca46f7cbb679eca5d4a9d
Diffstat (limited to 'src/particles/qquickimageparticle.cpp')
| -rw-r--r-- | src/particles/qquickimageparticle.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 9a0601b944..0145ce4edb 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -1379,6 +1379,15 @@ void QQuickImageParticle::finishBuildParticleNodes() perfLevel = Deformable; #endif +#ifdef Q_OS_MAC + // Mac OS X 10.8.3 introduced a bug in the AMD drivers, for at least the 2011 macbook pros, + // causing point sprites who read gl_PointCoord in the frag shader to come out as + // green-red blobs. + if (perfLevel < Deformable && strstr((char *) glGetString(GL_VENDOR), "ATI")) { + perfLevel = Deformable; + } +#endif + if (perfLevel >= Colored && !m_color.isValid()) m_color = QColor(Qt::white);//Hidden default, but different from unset |