Revert "Merge remote-tracking branch 'upstream/vbo-fix' into android"

This reverts commit 29f75d7, reversing changes made to 18d769e.
Velaron · Nov 7, 2023 · 81e4354 · 81e4354
1 parent 358e6dd
commit 81e4354
Showing 1 changed file with 21 additions and 28 deletions.
diff --git a/ref/gl/gl_rsurf.c b/ref/gl/gl_rsurf.c
@@ -2422,9 +2422,6 @@ draw details when not enough tmus
 */
 static void R_AdditionalPasses( vboarray_t *vbo, int indexlen, void *indexarray, texture_t *tex, qboolean resetvbo, size_t offset )
 {
-	if( !indexlen )
-		return;
-
 	// draw details in additional pass
 	if( r_detailtextures.value && r_vbo_detail.value == 1 && mtst.tmu_dt == -1 && tex->dt_texturenum )
 	{
@@ -2809,37 +2806,33 @@ Draw array for given vbotexture_t. build and draw dynamic lightmaps if present
 */
 static void R_DrawLightmappedVBO( vboarray_t *vbo, vbotexture_t *vbotex, texture_t *texture, int lightmap, qboolean skiplighting )
 {
-	if( vbotex->curindex )
-	{
 #if !defined XASH_NANOGL || defined XASH_WES && XASH_EMSCRIPTEN // WebGL need to know array sizes
-		if( pglDrawRangeElements )
-			pglDrawRangeElements( GL_TRIANGLES, 0, vbo->array_len, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
-		else
+	if( pglDrawRangeElements )
+		pglDrawRangeElements( GL_TRIANGLES, 0, vbo->array_len, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
+	else
 #endif
-		pglDrawElements( GL_TRIANGLES, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
+	pglDrawElements( GL_TRIANGLES, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
 
-		// draw debug lines
-		if( gl_wireframe.value && !skiplighting )
-		{
-			R_SetDecalMode( true );
-			pglDisable( GL_TEXTURE_2D );
-			GL_SelectTexture( XASH_TEXTURE0 );
-			pglDisable( GL_TEXTURE_2D );
-			pglDisable( GL_DEPTH_TEST );
+	// draw debug lines
+	if( gl_wireframe.value && !skiplighting )
+	{
+		R_SetDecalMode( true );
+		pglDisable( GL_TEXTURE_2D );
+		GL_SelectTexture( XASH_TEXTURE0 );
+		pglDisable( GL_TEXTURE_2D );
+		pglDisable( GL_DEPTH_TEST );
 #if !defined XASH_NANOGL || defined XASH_WES && XASH_EMSCRIPTEN // WebGL need to know array sizes
-			if( pglDrawRangeElements )
-				pglDrawRangeElements( GL_LINES, 0, vbo->array_len, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
-			else
+		if( pglDrawRangeElements )
+			pglDrawRangeElements( GL_LINES, 0, vbo->array_len, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
+		else
 #endif
-				pglDrawElements( GL_LINES, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
-			pglEnable( GL_DEPTH_TEST );
-			pglEnable( GL_TEXTURE_2D );
-			GL_SelectTexture( XASH_TEXTURE1 );
-			pglEnable( GL_TEXTURE_2D );
-			R_SetDecalMode( false );
-		}
+		pglDrawElements( GL_LINES, vbotex->curindex, GL_VBOINDEX_TYPE, vbotex->indexarray );
+		pglEnable( GL_DEPTH_TEST );
+		pglEnable( GL_TEXTURE_2D );
+		GL_SelectTexture( XASH_TEXTURE1 );
+		pglEnable( GL_TEXTURE_2D );
+		R_SetDecalMode( false );
 	}
-
 	//Msg( "%d %d %d\n", vbo->array_len, vbotex->len, lightmap );
 	if( skiplighting )
 	{