From 1d545f2968e7b5e548726761dbf24e2d719ae440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 6 May 2012 22:14:23 +0200 Subject: [PATCH] Tesselation-related shader types. Not used anywhere yet, just like geometry shader. --- src/Shader.cpp | 2 ++ src/Shader.h | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Shader.cpp b/src/Shader.cpp index 76c1e0d8a..bae0c5ff2 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -85,6 +85,8 @@ GLuint Shader::compile() { case Vertex: err << "vertex"; break; case Geometry: err << "geometry"; break; case Fragment: err << "fragment"; break; + case TesselationControl: err << "tesselation control"; break; + case TesselationEvaluation: err << "tesselation evaluation"; break; } /* Show error log and delete shader */ diff --git a/src/Shader.h b/src/Shader.h index d638bcb8f..a3838558b 100644 --- a/src/Shader.h +++ b/src/Shader.h @@ -51,7 +51,21 @@ class MAGNUM_EXPORT Shader { */ Geometry = GL_GEOMETRY_SHADER, - Fragment = GL_FRAGMENT_SHADER /**< Fragment shader */ + Fragment = GL_FRAGMENT_SHADER, /**< Fragment shader */ + + /** + * Tesselation control shader + * + * @requires_gl40 Extension ARB_tesselation_shader + */ + TesselationControl = GL_TESS_CONTROL_SHADER, + + /** + * Tesselation evaluation shader + * + * @requires_gl40 Extension ARB_tesselation_shader + */ + TesselationEvaluation = GL_TESS_EVALUATION_SHADER }; /** @brief %Shader state */