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

Gawain: append XXX to PRIM_QUADS to make it scary

Browse Source 
Quads are not part of modern GL or Vulkan, so we should avoid them. XXX makes coders think "hmm how could I draw this without using quads?"

Quads will be removed during the transition to core profile.

Part of T49043
This commit is contained in:
Mike Erwin
2017-04-07 14:21:10 -04:00
parent 23b10b549a
commit d6ae3789a1
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ typedef enum {
PRIM_TRIANGLES = GL_TRIANGLES, PRIM_TRIANGLES = GL_TRIANGLES,
#ifdef WITH_GL_PROFILE_COMPAT #ifdef WITH_GL_PROFILE_COMPAT
PRIM_QUADS = GL_QUADS, // legacy GL has this, modern GL & Vulkan do not PRIM_QUADS_XXX = GL_QUADS, // legacy GL has this, modern GL & Vulkan do not
#endif #endif
PRIM_LINE_STRIP = GL_LINE_STRIP, PRIM_LINE_STRIP = GL_LINE_STRIP,

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

@@ -168,7 +168,7 @@ static bool vertex_count_makes_sense_for_primitive(unsigned vertex_ct, Primitive
case PRIM_TRIANGLE_FAN: case PRIM_TRIANGLE_FAN:
return vertex_ct >= 3; return vertex_ct >= 3;
#ifdef WITH_GL_PROFILE_COMPAT #ifdef WITH_GL_PROFILE_COMPAT
case PRIM_QUADS: case PRIM_QUADS_XXX:
return vertex_ct % 4 == 0; return vertex_ct % 4 == 0;
#endif #endif
default: default:

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

@@ -25,7 +25,7 @@ PrimitiveClass prim_class_of_type(PrimitiveType prim_type)
[PRIM_TRIANGLE_FAN] = PRIM_CLASS_SURFACE, [PRIM_TRIANGLE_FAN] = PRIM_CLASS_SURFACE,
#ifdef WITH_GL_PROFILE_COMPAT #ifdef WITH_GL_PROFILE_COMPAT
[PRIM_QUADS] = PRIM_CLASS_SURFACE, [PRIM_QUADS_XXX] = PRIM_CLASS_SURFACE,
#endif #endif
}; };