glsl: fix tes linking regression
authorTimothy Arceri <timothy.arceri@collabora.com>
Mon, 23 Jan 2017 07:06:37 +0000 (18:06 +1100)
committerTimothy Arceri <timothy.arceri@collabora.com>
Mon, 23 Jan 2017 08:07:22 +0000 (19:07 +1100)
Fixes regression caused by cbeba6bd48da2c. I accidentally pushed the
wrong version of the patch.

src/compiler/glsl/linker.cpp

index 77eb78a..dafa39d 100644 (file)
@@ -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;