diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-05-16 14:41:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 18:33:06 +0200 |
| commit | ca63fd4e9e0e1e974518380991e6f814768d0ebe (patch) | |
| tree | 71285f200085813e095cf60ab8a3d2764eb9a9f0 /src/quick/scenegraph/coreapi/qsgrenderer.cpp | |
| parent | a9ad3dea7e936d82650b95a6a59ba25421f2e29f (diff) | |
Removed ### from scenegraph
Change-Id: I6b114938d2c52df95469975ffa87449f7fd8c647
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgrenderer.cpp')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgrenderer.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp index 30dd449b4b..76200b94d7 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp @@ -631,12 +631,9 @@ static inline GLenum qt_drawTypeForPattern(QSGGeometry::DataPattern p) void QSGRenderer::draw(const QSGMaterialShader *shader, const QSGGeometry *g) { - // ### remove before final release... - static bool use_vbo = !QGuiApplication::arguments().contains(QLatin1String("--no-vbo")); - const void *vertexData; int vertexByteSize = g->vertexCount() * g->sizeOfVertex(); - if (use_vbo && g->vertexDataPattern() != QSGGeometry::AlwaysUploadPattern && vertexByteSize > 1024) { + if (g->vertexDataPattern() != QSGGeometry::AlwaysUploadPattern && vertexByteSize > 1024) { // The base pointer for a VBO is 0 vertexData = 0; @@ -686,7 +683,7 @@ void QSGRenderer::draw(const QSGMaterialShader *shader, const QSGGeometry *g) // Set up the indices... const void *indexData; - if (use_vbo && g->indexDataPattern() != QSGGeometry::AlwaysUploadPattern && g->indexCount() > 512) { + if (g->indexDataPattern() != QSGGeometry::AlwaysUploadPattern && g->indexCount() > 512) { // Base pointer for a VBO is 0 indexData = 0; |