diff options
| author | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-05-10 13:44:24 +0300 |
|---|---|---|
| committer | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-05-10 13:44:24 +0300 |
| commit | c25b4c1434819d9638a3cc8a7eac2779d96bbc82 (patch) | |
| tree | 13ef6398f21da5f3290b86edfcc2afab6c6c9382 | |
| parent | f1dba040ba4b6abb17297aa76c1a344d780e2382 (diff) | |
Fixes: NB#167601
New:
Changes: fix logic in some if clauses of EGL backend
RevBy:
Details:
| -rw-r--r-- | src/mtexturepixmapitem_egl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mtexturepixmapitem_egl.cpp b/src/mtexturepixmapitem_egl.cpp index a4e4ebe..9cc4286 100644 --- a/src/mtexturepixmapitem_egl.cpp +++ b/src/mtexturepixmapitem_egl.cpp @@ -149,7 +149,7 @@ void MTexturePixmapItem::init() glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, d->textureId); - if (d->egl_image) + if (d->egl_image != EGL_NO_IMAGE_KHR) glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, d->egl_image); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -190,7 +190,7 @@ void MTexturePixmapItem::rebindPixmap() eglGetError()); glBindTexture(GL_TEXTURE_2D, d->textureId); - if (d->egl_image) + if (d->egl_image != EGL_NO_IMAGE_KHR) glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, d->egl_image); } @@ -198,7 +198,7 @@ void MTexturePixmapItem::enableDirectFbRendering() { d->damageTracking(false); - if (d->direct_fb_render || d->egl_image == EGL_NO_IMAGE_KHR) + if (d->direct_fb_render && d->egl_image == EGL_NO_IMAGE_KHR) return; d->direct_fb_render = true; @@ -219,7 +219,7 @@ void MTexturePixmapItem::enableRedirectedRendering() { d->damageTracking(true); - if (!d->direct_fb_render || d->egl_image != EGL_NO_IMAGE_KHR) + if (!d->direct_fb_render && d->egl_image != EGL_NO_IMAGE_KHR) return; d->direct_fb_render = false; |