summaryrefslogtreecommitdiffstats
path: root/examples/opengl/shared/qtlogo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/opengl/shared/qtlogo.cpp')
-rw-r--r--examples/opengl/shared/qtlogo.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/examples/opengl/shared/qtlogo.cpp b/examples/opengl/shared/qtlogo.cpp
index 1a3b94eff0..d3ccb7ac99 100644
--- a/examples/opengl/shared/qtlogo.cpp
+++ b/examples/opengl/shared/qtlogo.cpp
@@ -173,29 +173,11 @@ void Patch::translate(const QVector3D &t)
mat.translate(t);
}
-static inline void qMultMatrix(const QMatrix4x4 &mat)
-{
- if (sizeof(qreal) == sizeof(GLfloat))
- glMultMatrixf((GLfloat*)mat.constData());
-#ifndef QT_OPENGL_ES
- else if (sizeof(qreal) == sizeof(GLdouble))
- glMultMatrixd((GLdouble*)mat.constData());
-#endif
- else
- {
- GLfloat fmat[16];
- qreal const *r = mat.constData();
- for (int i = 0; i < 16; ++i)
- fmat[i] = r[i];
- glMultMatrixf(fmat);
- }
-}
-
//! [2]
void Patch::draw() const
{
glPushMatrix();
- qMultMatrix(mat);
+ glMultMatrixf(mat.constData());
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, faceColor);
const GLushort *indices = geom->faces.constData();