isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

[cogl-material] Fix some brackets in _layer_flush_gl_sampler_state

Browse Source 
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.
This commit is contained in:
Robert Bragg 2009-08-18 16:13:13 +01:00
parent ffd47f5b56
commit 9a55b0c3ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/cogl-material.c
View File

@ -1179,7 +1179,7 @@ _cogl_material_layer_flush_gl_sampler_state (CoglMaterialLayer *layer,
#ifndef DISABLE_MATERIAL_CACHE #ifndef DISABLE_MATERIAL_CACHE
if (!(gl_layer_info && if (!(gl_layer_info &&
gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE && 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 #endif
{ {
GE (glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE)); 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 #ifndef DISABLE_MATERIAL_CACHE
if (gl_layer_info && if ((gl_layer_info &&
(gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX || gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX) ||
layer->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX)) (layer->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX))
#endif #endif
{ {
_cogl_set_current_matrix (COGL_MATRIX_TEXTURE); _cogl_set_current_matrix (COGL_MATRIX_TEXTURE);