renderer2: disable vertex atrribs arrays on GLSL_ShutdownGPUShaders

src/renderer2/tr_glsl.c

@@ -2755,7 +2755,11 @@ void GLSL_ShutdownGPUShaders(void)
 
 	Ren_LogComment("------- GLSL_ShutdownGPUShaders -------\n");
 
-	//GLSL_VertexAttribsState(0);
+	for (i = 0; i < ATTR_INDEX_COUNT; i++)
+	{
+		glDisableVertexAttribArray(i);
+	}
+
 	GLSL_BindNullProgram();
 
 	// Clean up programInfo_t:s

src/renderer2/tr_local.h

@@ -1505,48 +1505,30 @@ typedef struct
 	void **elements;
 } growList_t;
 
-#if 0
-enum
-{
-	ATTR_INDEX_POSITION  = 0,
-	ATTR_INDEX_TEXCOORD0 = 8,
-	ATTR_INDEX_TEXCOORD1 = 9,
-//  ATTR_INDEX_TEXCOORD2 = 10,
-//  ATTR_INDEX_TEXCOORD3 = 11,
-	ATTR_INDEX_TANGENT        = 12,
-	ATTR_INDEX_BINORMAL       = 13,
-	ATTR_INDEX_NORMAL         = 14,
-	ATTR_INDEX_COLOR          = 15,
-	ATTR_INDEX_LIGHTCOLOR     = 16,
-	ATTR_INDEX_LIGHTDIRECTION = 17,
-	ATTR_INDEX_BONE_INDEXES   = 10,
-	ATTR_INDEX_BONE_WEIGHTS   = 11,
-};
-#else
+
 enum
 {
-	ATTR_INDEX_POSITION,
-	ATTR_INDEX_TEXCOORD0,
-	ATTR_INDEX_TEXCOORD1,
-	ATTR_INDEX_TANGENT,
-	ATTR_INDEX_BINORMAL,
-	ATTR_INDEX_NORMAL,
-	ATTR_INDEX_COLOR,
+	ATTR_INDEX_POSITION     = 0,
+	ATTR_INDEX_TEXCOORD0    = 1,
+	ATTR_INDEX_TEXCOORD1    = 2,
+	ATTR_INDEX_TANGENT      = 3,
+	ATTR_INDEX_BINORMAL     = 4,
+	ATTR_INDEX_NORMAL       = 5,
+	ATTR_INDEX_COLOR        = 6,
+	// GPU vertex skinning
+	ATTR_INDEX_BONE_INDEXES = 7,
+	ATTR_INDEX_BONE_WEIGHTS = 8,
+	// GPU vertex animations
+	ATTR_INDEX_POSITION2    = 9,
+	ATTR_INDEX_TANGENT2     = 10,
+	ATTR_INDEX_BINORMAL2    = 11,
+	ATTR_INDEX_NORMAL2      = 12,
 
-	//ATTR_INDEX_PAINTCOLOR,
+	//ATTR_INDEX_PAINTCOLOR,      ///< for advanced terrain blending
 	//ATTR_INDEX_LIGHTDIRECTION,
 
-	// GPU vertex skinning
-	ATTR_INDEX_BONE_INDEXES,
-	ATTR_INDEX_BONE_WEIGHTS,
-
-	// GPU vertex animations
-	ATTR_INDEX_POSITION2,
-	ATTR_INDEX_TANGENT2,
-	ATTR_INDEX_BINORMAL2,
-	ATTR_INDEX_NORMAL2,
+	ATTR_INDEX_COUNT        = 13
 };
-#endif
 
 // *INDENT-OFF*
 enum