diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-07 02:32:04 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-07 02:33:23 (GMT) |
| commit | cab39df3deb99aba7aa71a397055a2ec742921f4 (patch) | |
| tree | d2545580a617e6e8aa68de243c217af50b261122 /src/opengl/qglpixelbuffer_egl.cpp | |
| parent | 5a0b19a4559fa83e77cc6c6cd05fc492e692b667 (diff) | |
| download | Qt-cab39df3deb99aba7aa71a397055a2ec742921f4.zip Qt-cab39df3deb99aba7aa71a397055a2ec742921f4.tar.gz Qt-cab39df3deb99aba7aa71a397055a2ec742921f4.tar.bz2 | |
Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds work
Reviewed-by: trustme
Diffstat (limited to 'src/opengl/qglpixelbuffer_egl.cpp')
| -rw-r--r-- | src/opengl/qglpixelbuffer_egl.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp index 964efa2..5390fd1 100644 --- a/src/opengl/qglpixelbuffer_egl.cpp +++ b/src/opengl/qglpixelbuffer_egl.cpp @@ -47,6 +47,10 @@ #include <qimage.h> #include <private/qgl_p.h> +#ifdef QT_OPENGL_ES_1_CL +#include "qgl_cl_p.h" +#endif + QT_BEGIN_NAMESPACE #ifdef EGL_BIND_TO_TEXTURE_RGBA @@ -188,8 +192,8 @@ GLuint QGLPixelBuffer::generateDynamicTexture() const glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, d->req_size.width(), d->req_size.height(), 0, GL_RGB, GL_UNSIGNED_BYTE, 0); else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, d->req_size.width(), d->req_size.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); return texture; #else return 0; |