From: Eric Anholt <anholt@FreeBSD.org>
Date: Sat, 25 Sep 2004 21:08:30 +0000 (+0000)
Subject: Can't bail in sisDDLogicOpCode when logicop is off, because it's called with
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97ac8282f518210f640293e427b0e811801f7b9f;p=mesa.git

Can't bail in sisDDLogicOpCode when logicop is off, because it's called with
GL_COPY to turn off logicop.  Fixes glean's logicop test.
---

diff --git a/src/mesa/drivers/dri/sis/sis_state.c b/src/mesa/drivers/dri/sis/sis_state.c
index decee53a742..4b1d2b00178 100644
--- a/src/mesa/drivers/dri/sis/sis_state.c
+++ b/src/mesa/drivers/dri/sis/sis_state.c
@@ -441,9 +441,6 @@ sisDDLogicOpCode( GLcontext *ctx, GLenum opcode )
    __GLSiSHardware *prev = &smesa->prev;
    __GLSiSHardware *current = &smesa->current;
 
-   if (!ctx->Color.ColorLogicOpEnabled)
-      return;
-
    current->hwDstSet &= ~MASK_ROP2;
    switch (opcode)
    {