summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2012-08-25 19:39:51 +0100
committerRobert Bragg <robert@linux.intel.com>2012-09-03 15:51:45 +0100
commitfb22383993d76161d7f63446e715d4fa16623716 (patch)
tree20747c4f291dcea64ef97612ec863174a6a2d875
parent71f20064ab8185921ea95a4920d20c60dd7ad13d (diff)
downloadcogl-fb22383993d76161d7f63446e715d4fa16623716.tar.gz
pipeline: make _GET_LAYER_NO_CREATE enum a flag
_cogl_pipeline_get_layer_with_flags accepts a CoglPipelineGetLayerFlags flags argument and understands one COGL_PIPELINE_GET_LAYER_NO_CREATE flag. There was a mistake with the definition of this enum though so COGL_PIPELINE_GET_LAYER_NO_CREATE had a value of 0 and so testing for the flag using the bitwise & operator would never find the flag set. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5923f92f1428b3eb4977b5f21723f1b19a9d284a)
-rw-r--r--cogl/cogl-pipeline-private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl-pipeline-private.h
index a6caac5a..e88fce55 100644
--- a/cogl/cogl-pipeline-private.h
+++ b/cogl/cogl-pipeline-private.h
@@ -665,7 +665,7 @@ void _cogl_pipeline_update_blend_enable (CoglPipeline *pipeline,
typedef enum
{
- COGL_PIPELINE_GET_LAYER_NO_CREATE
+ COGL_PIPELINE_GET_LAYER_NO_CREATE = 1<<0
} CoglPipelineGetLayerFlags;
CoglPipelineLayer *