aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/util/qsgtexturematerial.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-09-04 21:50:27 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-05 23:38:30 +0200
commitefb24d1b7dfa9028cb53a464dd3bd1cbbfe5fc2c (patch)
treee92affb68acb01bafccb26ed684c3483e9da1112 /src/quick/scenegraph/util/qsgtexturematerial.cpp
parent21a08ccde3c7c2dc69e06b714549585bbf39b5c3 (diff)
Disable the isPowerOfTwo functions that are only used with OpenGL ES 2
Found by ICC 14. This warning is not made an error because ICC is too chatty when it comes to detecting unused functions. In this case, however, it is right. qsgtexturematerial.cpp(49): warning #177: function "isPowerOfTwo" was declared but never referenced qsgtexture.cpp(84): warning #177: function "isPowerOfTwo" was declared but never referenced qsgdefaultimagenode.cpp(368): warning #177: function "isPowerOfTwo" was declared but never referenced Change-Id: I6c96dad3e1236fd33a02232f886ca33fa2b21258 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexturematerial.cpp')
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index 87414766e3..0abfcd021b 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -46,11 +46,13 @@
QT_BEGIN_NAMESPACE
+#ifdef QT_OPENGL_ES_2
inline static bool isPowerOfTwo(int x)
{
// Assumption: x >= 1
return x == (x & -x);
}
+#endif
const char qt_scenegraph_texture_material_vertex_code[] =
"uniform highp mat4 qt_Matrix; \n"