From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 23 Apr 2008 01:10:52 +0000 (-0600)
Subject: gallium: fix bad logic in bind_pstip_fragment_shader(): use &&, not ||
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=91e37b71404a83b5e4258e129a2753f7c8fd0706;p=mesa.git

gallium: fix bad logic in bind_pstip_fragment_shader(): use &&, not ||
---

diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
index 61bdd29aa09..aec485a6e72 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
@@ -469,7 +469,7 @@ pstip_create_sampler(struct pstip_stage *pstip)
 static boolean
 bind_pstip_fragment_shader(struct pstip_stage *pstip)
 {
-   if (!pstip->fs->pstip_fs || 
+   if (!pstip->fs->pstip_fs &&
        !generate_pstip_fs(pstip))
       return FALSE;