TransformPipeline: Minor memory optimization and a prim sanity check

hrydgard · Jul 22, 2013 · eaf5cc1 · eaf5cc1 · unknownbrackets · Jul 23, 2013
1 parent 9c73528
commit eaf5cc1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp
@@ -1023,6 +1023,13 @@ void TransformDrawEngine::DecodeVerts() {
 			i = lastMatch;
 		}
 	}
+
+	// Sanity check
+	if (indexGen.Prim() < 0) {
+		ERROR_LOG(HLE, "DecodeVerts: Failed to deduce prim: %i", indexGen.Prim());
+		// Force to points (0)
+		indexGen.AddPrim(GE_PRIM_POINTS, 0);
+	}
 }
 
 u32 TransformDrawEngine::ComputeHash() {
@@ -1131,7 +1138,6 @@ void TransformDrawEngine::Flush() {
 				vai = iter->second;
 			} else {
 				vai = new VertexArrayInfo();
-				vai->decFmt = dec_->GetDecVtxFmt();
 				vai_[id] = vai;
 			}
 
@@ -1144,6 +1150,8 @@ void TransformDrawEngine::Flush() {
 					vai->status = VertexArrayInfo::VAI_HASHING;
 					vai->drawsUntilNextFullHash = 0;
 					DecodeVerts(); // writes to indexGen
+					vai->numVerts = indexGen.VertexCount();
+					vai->prim = indexGen.Prim();
 					goto rotateVBO;
 				}
 

diff --git a/GPU/GLES/TransformPipeline.h b/GPU/GLES/TransformPipeline.h
@@ -77,12 +77,9 @@ class VertexArrayInfo {
 	u32 vbo;
 	u32 ebo;
 
-	// TODO: see if we can avoid having this full thing here.
-	DecVtxFormat decFmt;
-
 	// Precalculated parameter for drawdrawElements
 	u16 numVerts;
-	u8 prim;
+	s8 prim;
 
 	// ID information
 	u8 numDCs;