From f3f9207786c2862b9b3fed1b4348ecb6a85cf02e Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 23 Jan 2017 18:06:37 +1100 Subject: [PATCH] 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 77eb78a4102..dafa39d438d 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; -- 2.30.2