From 7d1be415c6fd83468ede3641ffc07cfc06a6e9f9 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Tue, 16 Oct 2018 17:26:07 -1000
Subject: [PATCH] Fix tessellation pipeline setup

---
 lib/graphicsdev/D3D11.cpp  |  3 +++
 lib/graphicsdev/GL.cpp     | 35 ++++++++++++++++++++---------------
 lib/graphicsdev/Vulkan.cpp |  5 ++++-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/lib/graphicsdev/D3D11.cpp b/lib/graphicsdev/D3D11.cpp
index cc16275..6cf56bd 100644
--- a/lib/graphicsdev/D3D11.cpp
+++ b/lib/graphicsdev/D3D11.cpp
@@ -588,6 +588,9 @@ class D3D11ShaderPipeline : public GraphicsDataNode<IShaderPipeline>
         if (auto* s = evaluation.cast<D3D11ShaderStage>())
             s->shader(m_dShader);
 
+        if (control && evaluation)
+            m_topology = D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST + info.patchSize - 1;
+
         D3D11_CULL_MODE cullMode;
         switch (info.culling)
         {
diff --git a/lib/graphicsdev/GL.cpp b/lib/graphicsdev/GL.cpp
index 5777b95..367b7f3 100644
--- a/lib/graphicsdev/GL.cpp
+++ b/lib/graphicsdev/GL.cpp
@@ -839,7 +839,11 @@ protected:
     CullMode m_culling;
     uint32_t m_patchSize = 0;
     mutable GLint m_uniLocs[BOO_GLSL_MAX_UNIFORM_COUNT];
-    GLShaderPipeline(const ObjToken<BaseGraphicsData>& parent, const AdditionalPipelineInfo& info)
+    GLShaderPipeline(const ObjToken<BaseGraphicsData>& parent,
+                     ObjToken<IShaderStage> vertex, ObjToken<IShaderStage> fragment,
+                     ObjToken<IShaderStage> geometry, ObjToken<IShaderStage> control,
+                     ObjToken<IShaderStage> evaluation, const VertexFormatInfo& vtxFmt,
+                     const AdditionalPipelineInfo& info)
     : GraphicsDataNode<IShaderPipeline>(parent)
     {
         std::fill(std::begin(m_uniLocs), std::end(m_uniLocs), -1);
@@ -865,6 +869,19 @@ protected:
         m_culling = info.culling;
         m_drawPrim = PRIMITIVE_TABLE[int(info.prim)];
         m_patchSize = info.patchSize;
+
+        m_vertex = vertex;
+        m_fragment = fragment;
+        m_geometry = geometry;
+        m_control = control;
+        m_evaluation = evaluation;
+
+        if (control && evaluation)
+            m_drawPrim = GL_PATCHES;
+
+        m_elements.reserve(vtxFmt.elementCount);
+        for (size_t i=0 ; i<vtxFmt.elementCount ; ++i)
+            m_elements.push_back(vtxFmt.elements[i]);
     }
 public:
     ~GLShaderPipeline() { if (m_prog) glDeleteProgram(m_prog); }
@@ -1037,20 +1054,8 @@ GLDataFactory::Context::newShaderPipeline(ObjToken<IShaderStage> vertex, ObjToke
                        int(factory.m_maxPatchSize), int(additionalInfo.patchSize));
     }
 
-    ObjToken<IShaderPipeline> retval(new GLShaderPipeline(m_data, additionalInfo));
-    GLShaderPipeline& shader = *retval.cast<GLShaderPipeline>();
-
-    shader.m_vertex = vertex;
-    shader.m_fragment = fragment;
-    shader.m_geometry = geometry;
-    shader.m_control = control;
-    shader.m_evaluation = evaluation;
-
-    shader.m_elements.reserve(vtxFmt.elementCount);
-    for (size_t i=0 ; i<vtxFmt.elementCount ; ++i)
-        shader.m_elements.push_back(vtxFmt.elements[i]);
-
-    return retval;
+    return {new GLShaderPipeline(m_data, vertex, fragment, geometry, control,
+                                 evaluation, vtxFmt, additionalInfo)};
 }
 
 struct GLShaderDataBinding : GraphicsDataNode<IShaderDataBinding>
diff --git a/lib/graphicsdev/Vulkan.cpp b/lib/graphicsdev/Vulkan.cpp
index c914aab..6e46c3a 100644
--- a/lib/graphicsdev/Vulkan.cpp
+++ b/lib/graphicsdev/Vulkan.cpp
@@ -2230,7 +2230,10 @@ protected:
       m_colorWrite(info.colorWrite), m_alphaWrite(info.alphaWrite),
       m_overwriteAlpha(info.overwriteAlpha), m_culling(info.culling),
       m_patchSize(info.patchSize)
-    {}
+    {
+        if (control && evaluation)
+            m_prim = Primitive::Patches;
+    }
 public:
     ~VulkanShaderPipeline()
     {