[clutter/clutter-1.6] cogl-pipeline-fragend-fixed: Fix enabling texture targets
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.6] cogl-pipeline-fragend-fixed: Fix enabling texture targets
- Date: Fri, 27 May 2011 11:32:34 +0000 (UTC)
commit 0c323266cace61f0add9c33cf28bc9d26b856f63
Author: Neil Roberts <neil linux intel com>
Date: Fri May 27 12:29:09 2011 +0100
cogl-pipeline-fragend-fixed: Fix enabling texture targets
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.
This was backported from 54f94a0ed07e2 in the Cogl master branch.
https://bugzilla.gnome.org/show_bug.cgi?id=650979
clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c b/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c
index 5c36b52..e833fd3 100644
--- a/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c
+++ b/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c
@@ -180,7 +180,7 @@ _cogl_pipeline_fragend_fixed_add_layer (CoglPipeline *pipeline,
* it's enabled now.
*/
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);
GE (glEnable (unit->gl_target));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]