From 1af1b4dfdae520b144a6c1d247103ecf57390fc2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 7 Jan 2017 13:03:22 +0000 Subject: [PATCH] Fixed smallTile test as it was checking against <=2^14 rather than <2^16 which is more conservative than required for a ushort container --- src/osgTerrain/GeometryPool.cpp | 2 +- src/osgTerrain/GeometryTechnique.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgTerrain/GeometryPool.cpp b/src/osgTerrain/GeometryPool.cpp index 4c51783f0..905d156aa 100644 --- a/src/osgTerrain/GeometryPool.cpp +++ b/src/osgTerrain/GeometryPool.cpp @@ -262,7 +262,7 @@ osg::ref_ptr GeometryPool::getOrCreateGeometry(osgTerrain::Terra } } - bool smallTile = numVertices <= 16384; + bool smallTile = numVertices < 65536; GLenum primitiveTypes = GL_QUADS; diff --git a/src/osgTerrain/GeometryTechnique.cpp b/src/osgTerrain/GeometryTechnique.cpp index b2a15e4c1..bf4ce4d82 100644 --- a/src/osgTerrain/GeometryTechnique.cpp +++ b/src/osgTerrain/GeometryTechnique.cpp @@ -994,7 +994,7 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca // populate the primitive data // bool swapOrientation = !(masterLocator->orientationOpenGL()); - bool smallTile = numVertices <= 16384; + bool smallTile = numVertices < 65536; // OSG_NOTICE<<"smallTile = "<