diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.h b/Source/Core/VideoBackends/Software/OpcodeDecoder.h
index 8fd145ef1d..5bd5d1d530 100644
--- a/Source/Core/VideoBackends/Software/OpcodeDecoder.h
+++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.h
@@ -27,8 +27,11 @@ namespace OpcodeDecoder
 	#define GX_PRIMITIVE_SHIFT          3
 	#define GX_VAT_MASK                 0x07
 
-	//these are defined 1/8th of their real values and without their top bit
+	// These values are the values extracted using GX_PRIMITIVE_MASK
+	// and GX_PRIMITIVE_SHIFT.
+	// GX_DRAW_QUADS_2 behaves the same way as GX_DRAW_QUADS.
 	#define GX_DRAW_QUADS               0x0   //0x80
+	#define GX_DRAW_QUADS_2             0x1   //0x88
 	#define GX_DRAW_TRIANGLES           0x2   //0x90
 	#define GX_DRAW_TRIANGLE_STRIP      0x3   //0x98
 	#define GX_DRAW_TRIANGLE_FAN        0x4   //0xA0
diff --git a/Source/Core/VideoBackends/Software/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp
index 560e1d4863..171350db60 100644
--- a/Source/Core/VideoBackends/Software/SetupUnit.cpp
+++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp
@@ -27,6 +27,10 @@ void SetupUnit::SetupVertex()
 	case GX_DRAW_QUADS:
 		SetupQuad();
 		break;
+	case GX_DRAW_QUADS_2:
+		WARN_LOG(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2");
+		SetupQuad();
+		break;
 	case GX_DRAW_TRIANGLES:
 		SetupTriangle();
 		break;
diff --git a/Source/Core/VideoCommon/IndexGenerator.cpp b/Source/Core/VideoCommon/IndexGenerator.cpp
index 949ee342b1..1e713185a5 100644
--- a/Source/Core/VideoCommon/IndexGenerator.cpp
+++ b/Source/Core/VideoCommon/IndexGenerator.cpp
@@ -6,6 +6,7 @@
 
 #include "Common/Common.h"
 #include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/OpcodeDecoding.h"
 #include "VideoCommon/VideoConfig.h"
 
 //Init
@@ -21,22 +22,23 @@ void IndexGenerator::Init()
 {
 	if (g_Config.backend_info.bSupportsPrimitiveRestart)
 	{
-		primitive_table[0] = IndexGenerator::AddQuads<true>;
-		primitive_table[2] = IndexGenerator::AddList<true>;
-		primitive_table[3] = IndexGenerator::AddStrip<true>;
-		primitive_table[4] = IndexGenerator::AddFan<true>;
+		primitive_table[GX_DRAW_QUADS] = IndexGenerator::AddQuads<true>;
+		primitive_table[GX_DRAW_QUADS_2] = IndexGenerator::AddQuads_nonstandard<true>;
+		primitive_table[GX_DRAW_TRIANGLES] = IndexGenerator::AddList<true>;
+		primitive_table[GX_DRAW_TRIANGLE_STRIP] = IndexGenerator::AddStrip<true>;
+		primitive_table[GX_DRAW_TRIANGLE_FAN] = IndexGenerator::AddFan<true>;
 	}
 	else
 	{
-		primitive_table[0] = IndexGenerator::AddQuads<false>;
-		primitive_table[2] = IndexGenerator::AddList<false>;
-		primitive_table[3] = IndexGenerator::AddStrip<false>;
-		primitive_table[4] = IndexGenerator::AddFan<false>;
+		primitive_table[GX_DRAW_QUADS] = IndexGenerator::AddQuads<false>;
+		primitive_table[GX_DRAW_QUADS_2] = IndexGenerator::AddQuads_nonstandard<false>;
+		primitive_table[GX_DRAW_TRIANGLES] = IndexGenerator::AddList<false>;
+		primitive_table[GX_DRAW_TRIANGLE_STRIP] = IndexGenerator::AddStrip<false>;
+		primitive_table[GX_DRAW_TRIANGLE_FAN] = IndexGenerator::AddFan<false>;
 	}
-	primitive_table[1] = nullptr;
-	primitive_table[5] = &IndexGenerator::AddLineList;
-	primitive_table[6] = &IndexGenerator::AddLineStrip;
-	primitive_table[7] = &IndexGenerator::AddPoints;
+	primitive_table[GX_DRAW_LINES] = &IndexGenerator::AddLineList;
+	primitive_table[GX_DRAW_LINE_STRIP] = &IndexGenerator::AddLineStrip;
+	primitive_table[GX_DRAW_POINTS] = &IndexGenerator::AddPoints;
 }
 
 void IndexGenerator::Start(u16* Indexptr)
@@ -196,6 +198,12 @@ template <bool pr> u16* IndexGenerator::AddQuads(u16 *Iptr, u32 numVerts, u32 in
 	return Iptr;
 }
 
+template <bool pr> u16* IndexGenerator::AddQuads_nonstandard(u16 *Iptr, u32 numVerts, u32 index)
+{
+	WARN_LOG(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2");
+	return AddQuads<pr>(Iptr, numVerts, index);
+}
+
 // Lines
 u16* IndexGenerator::AddLineList(u16 *Iptr, u32 numVerts, u32 index)
 {
diff --git a/Source/Core/VideoCommon/IndexGenerator.h b/Source/Core/VideoCommon/IndexGenerator.h
index e5d09c8d96..c15ef75829 100644
--- a/Source/Core/VideoCommon/IndexGenerator.h
+++ b/Source/Core/VideoCommon/IndexGenerator.h
@@ -31,6 +31,7 @@ private:
 	template <bool pr> static u16* AddStrip(u16 *Iptr, u32 numVerts, u32 index);
 	template <bool pr> static u16* AddFan(u16 *Iptr, u32 numVerts, u32 index);
 	template <bool pr> static u16* AddQuads(u16 *Iptr, u32 numVerts, u32 index);
+	template <bool pr> static u16* AddQuads_nonstandard(u16 *Iptr, u32 numVerts, u32 index);
 
 	// Lines
 	static u16* AddLineList(u16 *Iptr, u32 numVerts, u32 index);
diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h
index bdc4976825..baf44bd40f 100644
--- a/Source/Core/VideoCommon/OpcodeDecoding.h
+++ b/Source/Core/VideoCommon/OpcodeDecoding.h
@@ -22,15 +22,17 @@
 #define GX_PRIMITIVE_SHIFT          3
 #define GX_VAT_MASK                 0x07
 
-//these are defined 1/8th of their real values and without their top bit
+// These values are the values extracted using GX_PRIMITIVE_MASK
+// and GX_PRIMITIVE_SHIFT.
+// GX_DRAW_QUADS_2 behaves the same way as GX_DRAW_QUADS.
 #define GX_DRAW_QUADS               0x0   // 0x80
+#define GX_DRAW_QUADS_2             0x1   // 0x88
 #define GX_DRAW_TRIANGLES           0x2   // 0x90
 #define GX_DRAW_TRIANGLE_STRIP      0x3   // 0x98
 #define GX_DRAW_TRIANGLE_FAN        0x4   // 0xA0
 #define GX_DRAW_LINES               0x5   // 0xA8
 #define GX_DRAW_LINE_STRIP          0x6   // 0xB0
 #define GX_DRAW_POINTS              0x7   // 0xB8
-#define GX_DRAW_NONE                0x1;  // This is a fake value to used in the backends
 
 extern bool g_bRecordFifoData;
 
diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp
index 029308a9f2..5e44a5aa0e 100644
--- a/Source/Core/VideoCommon/VertexManagerBase.cpp
+++ b/Source/Core/VideoCommon/VertexManagerBase.cpp
@@ -28,7 +28,7 @@ bool VertexManager::IsFlushed;
 
 static const PrimitiveType primitive_from_gx[8] = {
 	PRIMITIVE_TRIANGLES, // GX_DRAW_QUADS
-	PRIMITIVE_TRIANGLES, // GX_DRAW_NONE
+	PRIMITIVE_TRIANGLES, // GX_DRAW_QUADS_2
 	PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLES
 	PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLE_STRIP
 	PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLE_FAN
@@ -93,6 +93,7 @@ u32 VertexManager::GetRemainingIndices(int primitive)
 		switch (primitive)
 		{
 		case GX_DRAW_QUADS:
+		case GX_DRAW_QUADS_2:
 			return index_len / 5 * 4;
 		case GX_DRAW_TRIANGLES:
 			return index_len / 4 * 3;
@@ -118,6 +119,7 @@ u32 VertexManager::GetRemainingIndices(int primitive)
 		switch (primitive)
 		{
 		case GX_DRAW_QUADS:
+		case GX_DRAW_QUADS_2:
 			return index_len / 6 * 4;
 		case GX_DRAW_TRIANGLES:
 			return index_len;