diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2017-03-28 14:05:45 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2017-03-28 14:05:45 +0300 |
| commit | 855b56b90c7edf651684d84acccb168e70b355e2 (patch) | |
| tree | 3cbec8ada12a650f110abe0719b7d54cb2886663 | |
| parent | 885260117d6a9080ce073a1fb402b7af060f8645 (diff) | |
Add GL_LINE_STRIP_ADJACENCY support to Gawain
This primitive is used in geometry shaders like new grease pencil stroke shaders
| -rw-r--r-- | intern/gawain/gawain/primitive.h | 1 | ||||
| -rw-r--r-- | intern/gawain/src/immediate.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/intern/gawain/gawain/primitive.h b/intern/gawain/gawain/primitive.h index d1b8f5b3ec7..55333be6c9e 100644 --- a/intern/gawain/gawain/primitive.h +++ b/intern/gawain/gawain/primitive.h @@ -23,6 +23,7 @@ typedef enum { #endif 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_TRIANGLE_STRIP = GL_TRIANGLE_STRIP, PRIM_TRIANGLE_FAN = GL_TRIANGLE_FAN, diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c index 0e6a6ba51a0..4e584dcb3cb 100644 --- a/intern/gawain/src/immediate.c +++ b/intern/gawain/src/immediate.c @@ -160,6 +160,8 @@ static bool vertex_count_makes_sense_for_primitive(unsigned vertex_ct, Primitive case PRIM_LINE_STRIP: case PRIM_LINE_LOOP: return vertex_ct >= 2; + case PRIM_LINE_STRIP_ADJACENCY: + return vertex_ct >= 4; case PRIM_TRIANGLES: return vertex_ct % 3 == 0; case PRIM_TRIANGLE_STRIP: |