[Bf-blender-cvs] [0c47a83fb9d] blender2.8: GWN: Add GL_TRIANGLES_ADJACENCY to supported primitive types.

[Clément Foucault]

Commit: 0c47a83fb9d416370cfccd61065499c1a4e1cae6
Author: Clément Foucault
Date:   Sun Apr 22 21:33:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0c47a83fb9d416370cfccd61065499c1a4e1cae6

GWN: Add GL_TRIANGLES_ADJACENCY to supported primitive types.

===================================================================

M	intern/gawain/gawain/gwn_primitive.h
M	intern/gawain/src/gwn_primitive.c

===================================================================

diff --git a/intern/gawain/gawain/gwn_primitive.h b/intern/gawain/gawain/gwn_primitive.h
index 5e5b8019889..efcc67243ad 100644
--- a/intern/gawain/gawain/gwn_primitive.h
+++ b/intern/gawain/gawain/gwn_primitive.h
@@ -22,6 +22,7 @@ typedef enum {
 	GWN_PRIM_TRI_STRIP,
 	GWN_PRIM_TRI_FAN,
 
+	GWN_PRIM_TRIS_ADJ,
 	GWN_PRIM_LINE_STRIP_ADJ,
 
 	GWN_PRIM_NONE
diff --git a/intern/gawain/src/gwn_primitive.c b/intern/gawain/src/gwn_primitive.c
index b206b3ae1b3..8ec2a102df1 100644
--- a/intern/gawain/src/gwn_primitive.c
+++ b/intern/gawain/src/gwn_primitive.c
@@ -25,6 +25,7 @@ Gwn_PrimClass GWN_primtype_class(Gwn_PrimType prim_type)
 		[GWN_PRIM_TRI_FAN] = GWN_PRIM_CLASS_SURFACE,
 
 		[GWN_PRIM_LINE_STRIP_ADJ] = GWN_PRIM_CLASS_LINE,
+		[GWN_PRIM_TRIS_ADJ] = GWN_PRIM_CLASS_SURFACE,
 
 		[GWN_PRIM_NONE] = GWN_PRIM_CLASS_NONE
 		};
@@ -52,11 +53,12 @@ GLenum convert_prim_type_to_gl(Gwn_PrimType prim_type)
 		[GWN_PRIM_LINES] = GL_LINES,
 		[GWN_PRIM_LINE_STRIP] = GL_LINE_STRIP,
 		[GWN_PRIM_LINE_LOOP] = GL_LINE_LOOP,
-		[GWN_PRIM_TRIS] = GWN_PRIM_CLASS_SURFACE,
+		[GWN_PRIM_TRIS] = GL_TRIANGLES,
 		[GWN_PRIM_TRI_STRIP] = GL_TRIANGLE_STRIP,
 		[GWN_PRIM_TRI_FAN] = GL_TRIANGLE_FAN,
 
 		[GWN_PRIM_LINE_STRIP_ADJ] = GL_LINE_STRIP_ADJACENCY,
+		[GWN_PRIM_TRIS_ADJ] = GL_TRIANGLES_ADJACENCY,
 		};
 
 	return table[prim_type];