brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-pipeline-fragend-fixed: Fix enabling texture targets

Browse Source 
When flushing a pipeline that has more layers than the previous
pipeline, the fixed function fragend is supposed to detect that the
texture unit previously had no texture target enabled and then enable
it. However the logic for checking whether the unit was enabled was
broken due to a typing failure when unit->enabled and
unit->current_gl_target were combined into one value in commit
6b7139b0. This was breaking some of the conformance tests when the
fixed function fragend is used.

https://bugzilla.gnome.org/show_bug.cgi?id=650979
This commit is contained in:
Neil Roberts 2011-05-24 16:37:11 +01:00
parent d8df30cb9c
commit 54f94a0ed0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-pipeline-fragend-fixed.c
View File

@ -180,7 +180,7 @@ _cogl_pipeline_fragend_fixed_add_layer (CoglPipeline *pipeline,
* it's enabled now. * it's enabled now.
*/ */
if (!G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_TEXTURING)) && if (!G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_TEXTURING)) &&
!unit->enabled_gl_target == 0) unit->enabled_gl_target == 0)
{ {
_cogl_set_active_texture_unit (unit_index); _cogl_set_active_texture_unit (unit_index);
GE (glEnable (unit->gl_target)); GE (glEnable (unit->gl_target));