Merge pull request #804 from eligovision/OpenSceneGraph-3.6_GLQUADS

[*] ParticleSystem: Use GL_TRIANGLES instead if GL_QUADS when GL{1,2}…
This commit is contained in:
OpenSceneGraph git repository 2019-07-29 08:57:56 +01:00 committed by GitHub
commit 99847c3ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -411,7 +411,7 @@ void osgParticle::ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo
texcoords.push_back(t1);
texcoords.push_back(t2);
#if !defined(OSG_GLES2_AVAILABLE)
#if defined(OSG_GL1_AVAILABLE) || defined(OSG_GL2_AVAILABLE) || defined(OSG_GLES1_AVAILABLE)
const unsigned int count = 4;
const GLenum mode = GL_QUADS;
@ -419,7 +419,7 @@ void osgParticle::ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo
vertices.push_back(c3);
texcoords.push_back(t3);
#else
// No GL_QUADS mode on GLES2 and upper
// No GL_QUADS mode on OpenGL 3 and upper / GLES2 and upper
const unsigned int count = 6;
const GLenum mode = GL_TRIANGLES;