Cycles microdisplacement: refactor to move some tesselation code from SubdMesh to Mesh

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D1915

1 files changed, 6 insertions, 2 deletions

diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index 57b16f7fd4e..006a4889d50 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -38,6 +38,7 @@ class Progress;
 class Scene;
 class SceneParams;
 class AttributeRequest;
+class DiagSplit;
 
 /* Mesh */
 
@@ -85,6 +86,7 @@ public:
 	vector<Triangle> triangles;
 	vector<uint> shader;
 	vector<bool> smooth;
+	vector<bool> forms_quad; /* used to tell if triangle is part of a quad patch */
 
 	bool has_volume;  /* Set in the device_update_flags(). */
 	bool has_surface_bssrdf;  /* Set in the device_update_flags(). */
@@ -123,8 +125,8 @@ public:
 
 	void reserve(int numverts, int numfaces, int numcurves, int numcurvekeys);
 	void clear();
-	void set_triangle(int i, int v0, int v1, int v2, int shader, bool smooth);
-	void add_triangle(int v0, int v1, int v2, int shader, bool smooth);
+	void set_triangle(int i, int v0, int v1, int v2, int shader, bool smooth, bool forms_quad = false);
+	void add_triangle(int v0, int v1, int v2, int shader, bool smooth, bool forms_quad = false);
 	void add_curve_key(float3 loc, float radius);
 	void add_curve(int first_key, int num_keys, int shader);
 	int split_vertex(int vertex);
@@ -157,6 +159,8 @@ public:
 
 	/* Check if the mesh should be treated as instanced. */
 	bool is_instanced() const;
+
+	void tessellate(DiagSplit *split);
 };
 
 /* Mesh Manager */