Mesa (master): glsl: fix tes linking regression

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: f3f9207786c2862b9b3fed1b4348ecb6a85cf02e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3f9207786c2862b9b3fed1b4348ecb6a85cf02e

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Mon Jan 23 18:06:37 2017 +1100

glsl: fix tes linking regression

Fixes regression caused by cbeba6bd48da2c. I accidentally pushed the
wrong version of the patch.

---

 src/compiler/glsl/linker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 77eb78a..dafa39d 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -1804,13 +1804,13 @@ link_tes_in_layout_qualifiers(struct gl_shader_program *prog,
    if (gl_prog->info.tess.spacing == TESS_SPACING_UNSPECIFIED)
       gl_prog->info.tess.spacing = TESS_SPACING_EQUAL;
 
-   if (vertex_order == 0)
+   if (vertex_order == 0 || vertex_order == GL_CCW)
       gl_prog->info.tess.ccw = true;
    else
       gl_prog->info.tess.ccw = false;
 
 
-   if (point_mode == -1)
+   if (point_mode == -1 || point_mode == GL_FALSE)
       gl_prog->info.tess.point_mode = false;
    else
       gl_prog->info.tess.point_mode = true;