diff options
author | Mike Erwin <significant.bit@gmail.com> | 2017-04-10 23:20:24 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2017-04-10 23:20:24 +0300 |
commit | fb1ecbc2da9fe8ca569fc507275712a7645859fe (patch) | |
tree | b3d75bf3cdf4a7366000880bbee3966ed2217f40 /intern | |
parent | f0404c3382f36554ed52b7765029c1b8dc6cacb3 (diff) |
Gawain: remove PRIM_QUADS_XXX
Thanks @mont29 for finishing off the last few QUADS in blender.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/gawain/gawain/primitive.h | 4 | ||||
-rw-r--r-- | intern/gawain/src/immediate.c | 4 | ||||
-rw-r--r-- | intern/gawain/src/primitive.c | 8 |
3 files changed, 0 insertions, 16 deletions
diff --git a/intern/gawain/gawain/primitive.h b/intern/gawain/gawain/primitive.h index c9123ec79df..9140e8a2478 100644 --- a/intern/gawain/gawain/primitive.h +++ b/intern/gawain/gawain/primitive.h @@ -24,10 +24,6 @@ typedef enum { PRIM_LINE_STRIP_ADJACENCY, -#ifdef WITH_GL_PROFILE_COMPAT - PRIM_QUADS_XXX, // legacy GL has this, modern GL & Vulkan do not -#endif - PRIM_NONE } PrimitiveType; diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c index 15cd1cc801f..c6d87cbc029 100644 --- a/intern/gawain/src/immediate.c +++ b/intern/gawain/src/immediate.c @@ -167,10 +167,6 @@ static bool vertex_count_makes_sense_for_primitive(unsigned vertex_ct, Primitive case PRIM_TRIANGLE_STRIP: case PRIM_TRIANGLE_FAN: return vertex_ct >= 3; - #ifdef WITH_GL_PROFILE_COMPAT - case PRIM_QUADS_XXX: - return vertex_ct % 4 == 0; - #endif default: return false; } diff --git a/intern/gawain/src/primitive.c b/intern/gawain/src/primitive.c index 21cee01d4db..90b3686b17d 100644 --- a/intern/gawain/src/primitive.c +++ b/intern/gawain/src/primitive.c @@ -25,10 +25,6 @@ PrimitiveClass prim_class_of_type(PrimitiveType prim_type) [PRIM_LINE_STRIP_ADJACENCY] = PRIM_CLASS_LINE, -#ifdef WITH_GL_PROFILE_COMPAT - [PRIM_QUADS_XXX] = PRIM_CLASS_SURFACE, -#endif - [PRIM_NONE] = PRIM_CLASS_NONE }; @@ -60,10 +56,6 @@ GLenum convert_prim_type_to_gl(PrimitiveType prim_type) [PRIM_TRIANGLE_FAN] = GL_TRIANGLE_FAN, [PRIM_LINE_STRIP_ADJACENCY] = GL_LINE_STRIP_ADJACENCY, - -#ifdef WITH_GL_PROFILE_COMPAT - [PRIM_QUADS_XXX] = GL_QUADS, -#endif }; return table[prim_type]; |