summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2017-11-16 19:14:28 +0200
committerruslantproductengine <ruslantproductengine@lindenlab.com>2017-11-16 19:14:28 +0200
commitd310159beee21fe1314a97bde83b0102a9e36de3 (patch)
treea3079ae8d611a0c93c43d655c29318cb3fc1c736 /indra/newview
parent6d94bb263fe7ab6eac2d578befdee6fdb4779c15 (diff)
MAINT-7977 [Alex Ivy] Feature Table crashes
In case of buff->getVertexStrider(v) return false it mean that glMapBufferRange() return NULL The next three lines can be the reason of this crash.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llglsandbox.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index c80dec0e75..44e7ae15ba 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -963,11 +963,16 @@ F32 gpu_benchmark()
LLStrider<LLVector3> v;
LLStrider<LLVector2> tc;
- buff->getVertexStrider(v);
-
- v[0].set(-1,1,0);
- v[1].set(-1,-3,0);
- v[2].set(3,1,0);
+ if (buff->getVertexStrider(v))
+ {
+ v[0].set(-1, 1, 0);
+ v[1].set(-1, -3, 0);
+ v[2].set(3, 1, 0);
+ }
+ else
+ {
+ LL_WARNS() << "GL LLVertexBuffer::getVertexStrider() return false " << (NULL == buff->getMappedData() ? "buff->getMappedData() is NULL" : "buff->getMappedData() not NULL") << LL_ENDL;
+ }
buff->flush();