blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Gawain: remove PRIM_QUADS_XXX 

Thanks @mont29 for finishing off the last few QUADS in blender.
This commit is contained in:
Mike Erwin 2017-04-10 16:20:24 -04:00
parent f0404c3382
commit fb1ecbc2da
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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;
}

8
intern/gawain/src/primitive.c
View File

@ -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];