From aa49386c44b1379ee095a6e528b1a392a1c0e8da Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 19 Nov 2014 11:28:04 -0800
Subject: [PATCH] Roll back changes to geo drawn in gpu_bench to stop punishing
cards with low fill rate
---
indra/newview/llglsandbox.cpp | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 04429ddd75..cc43f787d8 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -958,7 +958,7 @@ F32 gpu_benchmark()
//make a dummy triangle to draw with
LLPointer<LLVertexBuffer> buff = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, GL_STATIC_DRAW_ARB);
- buff->allocateBuffer(12, 0, true);
+ buff->allocateBuffer(3, 0, true);
LLStrider<LLVector3> v;
LLStrider<LLVector2> tc;
@@ -968,15 +968,6 @@ F32 gpu_benchmark()
v[0].set(-1,1,0);
v[1].set(-1,-3,0);
v[2].set(3,1,0);
- v[3].set(-1,1,0);
- v[4].set(-1,-3,0);
- v[5].set(3,1,0);
- v[6].set(-1,1,0);
- v[7].set(-1,-3,0);
- v[8].set(3,1,0);
- v[9].set(-1,1,0);
- v[10].set(-1,-3,0);
- v[11].set(3,1,0);
buff->flush();
@@ -996,7 +987,7 @@ F32 gpu_benchmark()
{
dest[i].bindTarget();
gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, source[i]);
- buff->drawArrays(LLRender::TRIANGLES, 0, 12);
+ buff->drawArrays(LLRender::TRIANGLES, 0, 3);
dest[i].flush();
}
--
GitLab