FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for using glGenerateMipmap instead of GL_GENERATE_MIPMAP_SGIS on GLES2

Browse Source
This commit is contained in:
Robert Osfield 2012-02-24 12:15:15 +00:00
parent 3ca30736b4
commit c3fb8dc714
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/osgText/Glyph.cpp
View File

@ -155,6 +155,23 @@ void GlyphTexture::apply(osg::State& state) const
bool newTextureObject = (textureObject == 0); bool newTextureObject = (textureObject == 0);
#if defined(OSG_GLES2_AVAILABLE)
bool requiresGenerateMipmapCall = false;
// need to look to see generate mip map call is required.
switch(_min_filter)
{
case NEAREST_MIPMAP_NEAREST:
case NEAREST_MIPMAP_LINEAR:
case LINEAR_MIPMAP_NEAREST:
case LINEAR_MIPMAP_LINEAR:
requiresGenerateMipmapCall = generateMipMapSupported;
break;
default:
break;
}
#endif
if (newTextureObject) if (newTextureObject)
{ {
GLint maxTextureSize = 256; GLint maxTextureSize = 256;
@ -177,7 +194,6 @@ void GlyphTexture::apply(osg::State& state) const
applyTexParameters(GL_TEXTURE_2D,state); applyTexParameters(GL_TEXTURE_2D,state);
// need to look at generate mip map extension if mip mapping required. // need to look at generate mip map extension if mip mapping required.
switch(_min_filter) switch(_min_filter)
{ {
@ -187,7 +203,9 @@ void GlyphTexture::apply(osg::State& state) const
case LINEAR_MIPMAP_LINEAR: case LINEAR_MIPMAP_LINEAR:
if (generateMipMapSupported) if (generateMipMapSupported)
{ {
#if !defined(OSG_GLES2_AVAILABLE)
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS,GL_TRUE); glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS,GL_TRUE);
#endif
} }
else glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, LINEAR); else glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, LINEAR);
break; break;
@ -274,7 +292,13 @@ void GlyphTexture::apply(osg::State& state) const
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
if (!s_subloadAllGlyphsTogether) bool subloadAllGlyphsTogether = s_subloadAllGlyphsTogether;
#if defined(OSG_GLES2_AVAILABLE)
if (requiresGenerateMipmapCall) subloadAllGlyphsTogether = true;
#endif
if (!subloadAllGlyphsTogether)
{ {
if (newTextureObject) if (newTextureObject)
{ {
@ -349,6 +373,10 @@ void GlyphTexture::apply(osg::State& state) const
getTextureHeight(), getTextureHeight(),
GL_ALPHA, GL_UNSIGNED_BYTE, local_data ); GL_ALPHA, GL_UNSIGNED_BYTE, local_data );
#if defined(OSG_GLES2_AVAILABLE)
if (requiresGenerateMipmapCall) glGenerateMipmap(GL_TEXTURE_2D);
#endif
delete [] local_data; delete [] local_data;
} }