[Bf-blender-cvs] [d6ae3789a14] blender2.8: Gawain: append XXX to PRIM_QUADS to make it scary

[Mike Erwin]

Commit: d6ae3789a1462931f29b523badb5f2173aa83902
Author: Mike Erwin
Date:   Fri Apr 7 14:21:10 2017 -0400
Branches: blender2.8
https://developer.blender.org/rBd6ae3789a1462931f29b523badb5f2173aa83902

Gawain: append XXX to PRIM_QUADS to make it scary

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

===================================================================

M	intern/gawain/gawain/primitive.h
M	intern/gawain/src/immediate.c
M	intern/gawain/src/primitive.c

===================================================================

diff --git a/intern/gawain/gawain/primitive.h b/intern/gawain/gawain/primitive.h
index 55333be6c9e..214902e9a2b 100644
--- a/intern/gawain/gawain/primitive.h
+++ b/intern/gawain/gawain/primitive.h
@@ -19,7 +19,7 @@ typedef enum {
 	PRIM_TRIANGLES = GL_TRIANGLES,
 
 #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
 
 	PRIM_LINE_STRIP = GL_LINE_STRIP,
diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c
index 4e584dcb3cb..e6d338afbc1 100644
--- a/intern/gawain/src/immediate.c
+++ b/intern/gawain/src/immediate.c
@@ -168,7 +168,7 @@ static bool vertex_count_makes_sense_for_primitive(unsigned vertex_ct, Primitive
 		case PRIM_TRIANGLE_FAN:
 			return vertex_ct >= 3;
   #ifdef WITH_GL_PROFILE_COMPAT
-		case PRIM_QUADS:
+		case PRIM_QUADS_XXX:
 			return vertex_ct % 4 == 0;
   #endif
 		default:
diff --git a/intern/gawain/src/primitive.c b/intern/gawain/src/primitive.c
index 95472c289e8..7fee06021b8 100644
--- a/intern/gawain/src/primitive.c
+++ b/intern/gawain/src/primitive.c
@@ -25,7 +25,7 @@ PrimitiveClass prim_class_of_type(PrimitiveType prim_type)
 		[PRIM_TRIANGLE_FAN] = PRIM_CLASS_SURFACE,
 
 #ifdef WITH_GL_PROFILE_COMPAT
-		[PRIM_QUADS] = PRIM_CLASS_SURFACE,
+		[PRIM_QUADS_XXX] = PRIM_CLASS_SURFACE,
 #endif
 		};