Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add GL_LINE_STRIP_ADJACENCY support to Gawain

Browse Source 
This primitive is used in geometry shaders like new grease pencil stroke shaders
This commit is contained in:
Antonio Vazquez
2017-03-28 13:05:45 +02:00
parent 885260117d
commit 855b56b90c
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/gawain/gawain/primitive.h
View File

@@ -23,6 +23,7 @@ typedef enum {
#endif #endif
PRIM_LINE_STRIP = GL_LINE_STRIP, PRIM_LINE_STRIP = GL_LINE_STRIP,
PRIM_LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY,
PRIM_LINE_LOOP = GL_LINE_LOOP, // GL has this, Vulkan does not PRIM_LINE_LOOP = GL_LINE_LOOP, // GL has this, Vulkan does not
PRIM_TRIANGLE_STRIP = GL_TRIANGLE_STRIP, PRIM_TRIANGLE_STRIP = GL_TRIANGLE_STRIP,
PRIM_TRIANGLE_FAN = GL_TRIANGLE_FAN, PRIM_TRIANGLE_FAN = GL_TRIANGLE_FAN,

2
intern/gawain/src/immediate.c
View File

@@ -160,6 +160,8 @@ static bool vertex_count_makes_sense_for_primitive(unsigned vertex_ct, Primitive
case PRIM_LINE_STRIP: case PRIM_LINE_STRIP:
case PRIM_LINE_LOOP: case PRIM_LINE_LOOP:
return vertex_ct >= 2; return vertex_ct >= 2;
case PRIM_LINE_STRIP_ADJACENCY:
return vertex_ct >= 4;
case PRIM_TRIANGLES: case PRIM_TRIANGLES:
return vertex_ct % 3 == 0; return vertex_ct % 3 == 0;
case PRIM_TRIANGLE_STRIP: case PRIM_TRIANGLE_STRIP: