summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-06-04 00:13:54 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-06-04 00:13:54 (GMT)
commit7010a53cbd6bc6d9cc6d63e2170a7300ce2750d8 (patch)
tree323233749dd13a97bb01272d32e3cee1f4f57d44 /demos
parent55148bf3c47546a93222c3e48a3e1bad062b5640 (diff)
downloadQt-7010a53cbd6bc6d9cc6d63e2170a7300ce2750d8.zip
Qt-7010a53cbd6bc6d9cc6d63e2170a7300ce2750d8.tar.gz
Qt-7010a53cbd6bc6d9cc6d63e2170a7300ce2750d8.tar.bz2
Improvements to shader API in response to API review
Task-number: QT-80 Reviewed-by: Ian Walters
Diffstat (limited to 'demos')
-rw-r--r--demos/boxes/scene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
index e2aa16b..2376782 100644
--- a/demos/boxes/scene.cpp
+++ b/demos/boxes/scene.cpp
@@ -559,7 +559,7 @@ void Scene::initGL()
<< ":/res/boxes/cubemap_negy.jpg" << ":/res/boxes/cubemap_posz.jpg" << ":/res/boxes/cubemap_negz.jpg";
m_environment = new GLTextureCube(list, qMin(1024, m_maxTextureSize));
m_environmentShader = new QGLShader(QGLShader::FragmentShader);
- m_environmentShader->setSourceCode(environmentShaderText);
+ m_environmentShader->compile(environmentShaderText);
m_environmentProgram = new QGLShaderProgram;
m_environmentProgram->addShader(m_vertexShader);
m_environmentProgram->addShader(m_environmentShader);