diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-03-23 22:58:57 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-03-23 22:58:57 (GMT) |
| commit | 732f3d1e2c8f63972a9a1ca477d1a9ac34361534 (patch) | |
| tree | 325dc09e36e39d0a800dd6a8b0d68cc38ce012c0 /demos/boxes/scene.h | |
| parent | dc789e34bd2ff519024af077bebdf09c85e138e0 (diff) | |
| download | Qt-732f3d1e2c8f63972a9a1ca477d1a9ac34361534.zip Qt-732f3d1e2c8f63972a9a1ca477d1a9ac34361534.tar.gz Qt-732f3d1e2c8f63972a9a1ca477d1a9ac34361534.tar.bz2 | |
Import shader implementation from before the history cut.
Diffstat (limited to 'demos/boxes/scene.h')
| -rw-r--r-- | demos/boxes/scene.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index 2db9317..c056739 100644 --- a/demos/boxes/scene.h +++ b/demos/boxes/scene.h @@ -53,7 +53,6 @@ #include "vector.h" #include "trackball.h" #include "glbuffers.h" -#include "glshaders.h" #include "qtbox.h" #define PI 3.14159265358979 @@ -231,11 +230,11 @@ private: GLTexture3D *m_noise; GLRenderTargetCube *m_mainCubemap; QVector<GLRenderTargetCube *> m_cubemaps; - QVector<GLProgram *> m_programs; - GLVertexShader *m_vertexShader; - QVector<GLFragmentShader *> m_fragmentShaders; - GLFragmentShader *m_environmentShader; - GLProgram *m_environmentProgram; + QVector<QGLShaderProgram *> m_programs; + QGLShader *m_vertexShader; + QVector<QGLShader *> m_fragmentShaders; + QGLShader *m_environmentShader; + QGLShaderProgram *m_environmentProgram; }; |