summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-05-10 22:09:29 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-05-10 22:09:29 (GMT)
commitd03757e2bcf267790bf84d1b0e78c39c87b571ca (patch)
tree2af233a7ad2db09796289f0e73118989d2cace82 /demos
parent79bc8f778f0b7b935ce3d808d8c91c3730f886bb (diff)
downloadQt-d03757e2bcf267790bf84d1b0e78c39c87b571ca.zip
Qt-d03757e2bcf267790bf84d1b0e78c39c87b571ca.tar.gz
Qt-d03757e2bcf267790bf84d1b0e78c39c87b571ca.tar.bz2
Mac OSX compile errors in shader usage
Diffstat (limited to 'demos')
-rw-r--r--demos/boxes/scene.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
index db32928..e2aa16b 100644
--- a/demos/boxes/scene.cpp
+++ b/demos/boxes/scene.cpp
@@ -680,9 +680,9 @@ void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
if (glActiveTexture) {
m_environment->bind();
m_environmentProgram->enable();
- m_environmentProgram->setUniformValue("tex", 0);
- m_environmentProgram->setUniformValue("env", 1);
- m_environmentProgram->setUniformValue("noise", 2);
+ m_environmentProgram->setUniformValue("tex", GLint(0));
+ m_environmentProgram->setUniformValue("env", GLint(1));
+ m_environmentProgram->setUniformValue("noise", GLint(2));
m_box->draw();
m_environmentProgram->disable();
m_environment->unbind();
@@ -715,9 +715,9 @@ void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
m_environment->bind();
}
m_programs[i]->enable();
- m_programs[i]->setUniformValue("tex", 0);
- m_programs[i]->setUniformValue("env", 1);
- m_programs[i]->setUniformValue("noise", 2);
+ m_programs[i]->setUniformValue("tex", GLint(0));
+ m_programs[i]->setUniformValue("env", GLint(1));
+ m_programs[i]->setUniformValue("noise", GLint(2));
m_programs[i]->setUniformValue("view", view);
m_programs[i]->setUniformValue("invView", invView);
m_box->draw();
@@ -746,9 +746,9 @@ void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
}
m_programs[m_currentShader]->enable();
- m_programs[m_currentShader]->setUniformValue("tex", 0);
- m_programs[m_currentShader]->setUniformValue("env", 1);
- m_programs[m_currentShader]->setUniformValue("noise", 2);
+ m_programs[m_currentShader]->setUniformValue("tex", GLint(0));
+ m_programs[m_currentShader]->setUniformValue("env", GLint(1));
+ m_programs[m_currentShader]->setUniformValue("noise", GLint(2));
m_programs[m_currentShader]->setUniformValue("view", view);
m_programs[m_currentShader]->setUniformValue("invView", invView);
m_box->draw();