From: Robert Bragg <robert@linux.intel.com>
Date: Tue, 18 Aug 2009 15:13:13 +0000 (+0100)
Subject: [cogl-material] Fix some brackets in _layer_flush_gl_sampler_state
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9befb055d0dd993d1171bf5652eefdc35567e7f5;p=profile%2Fivi%2Fclutter.git

[cogl-material] Fix some brackets in _layer_flush_gl_sampler_state

The wrong part of an expression was bracketed in the test to determine
when a new texture matrix needed to be loaded which resulted in the
first pass through _cogl_material_layer_flush_gl_sampler_state
not uploading any user matrix.
---

diff --git a/clutter/cogl/common/cogl-material.c b/clutter/cogl/common/cogl-material.c
index 86189b9..70d139b 100644
--- a/clutter/cogl/common/cogl-material.c
+++ b/clutter/cogl/common/cogl-material.c
@@ -1179,7 +1179,7 @@ _cogl_material_layer_flush_gl_sampler_state (CoglMaterialLayer  *layer,
 #ifndef DISABLE_MATERIAL_CACHE
   if (!(gl_layer_info &&
         gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE &&
-        layer->flags & COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE))
+       (layer->flags & COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE)))
 #endif
     {
       GE (glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE));
@@ -1247,9 +1247,9 @@ _cogl_material_layer_flush_gl_sampler_state (CoglMaterialLayer  *layer,
     }
 
 #ifndef DISABLE_MATERIAL_CACHE
-  if (gl_layer_info &&
-      (gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX ||
-       layer->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX))
+  if ((gl_layer_info &&
+       gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX) ||
+      (layer->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX))
 #endif
     {
       _cogl_set_current_matrix (COGL_MATRIX_TEXTURE);