summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2011-07-19 14:40:29 +0100
committerRobert Bragg <robert@linux.intel.com>2011-07-19 14:40:29 +0100
commiteb578e4e0c8e385fbf77193690a0adb05de27f53 (patch)
tree2c4ad8be80c26c5eafa6cca23349444e721a5308
parentdb7f0879531ba397b2091640f7f39d4468544f9a (diff)
downloadcogl-eb578e4e0c8e385fbf77193690a0adb05de27f53.tar.gz
gles: Or in private features into ctx->private_feature_flags
When we moved all the GL function pointers to be part of CoglContext in commit dae02a99a5c8c5 we made a mistake and started to OR in the private COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE feature flag into the non private flags which would mean cogl would think the GL_OES_EGL_image extension wasn't supported. Reviewed-by: Neil Roberts <neil@linux.intel.com>
-rw-r--r--cogl/driver/gles/cogl-gles.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/driver/gles/cogl-gles.c b/cogl/driver/gles/cogl-gles.c
index 4ca18695..8418a7ab 100644
--- a/cogl/driver/gles/cogl-gles.c
+++ b/cogl/driver/gles/cogl-gles.c
@@ -120,7 +120,7 @@ _cogl_gles_update_features (CoglContext *context,
flags |= COGL_FEATURE_MAP_BUFFER_FOR_WRITE;
if (context->glEGLImageTargetTexture2D)
- flags |= COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE;
+ private_flags |= COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE;
/* Cache features */
context->private_feature_flags |= private_flags;