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

Merge pull request #251 from emminizer/OpenSceneGraph-3.4

Browse Source 
osgText::Glyph: Explicitly set GL_TEXTURE_MIN_FILTER to address disap…
This commit is contained in:
OpenSceneGraph git repository 2017-05-10 11:08:27 +01:00 committed by GitHub
commit 0af180f8b0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgText/Glyph.cpp
View File

@ -373,6 +373,7 @@ void GlyphTexture::apply(osg::State& state) const
glyphsWereSubloading.clear(); glyphsWereSubloading.clear();
glPixelStorei(GL_UNPACK_ALIGNMENT,1); glPixelStorei(GL_UNPACK_ALIGNMENT,1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, getFilter(osg::Texture::MIN_FILTER));
#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
glPixelStorei(GL_UNPACK_ROW_LENGTH,getTextureWidth()); glPixelStorei(GL_UNPACK_ROW_LENGTH,getTextureWidth());
@ -517,6 +518,10 @@ void Glyph::subload() const
#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
glPixelStorei(GL_UNPACK_ROW_LENGTH,getRowLength()); glPixelStorei(GL_UNPACK_ROW_LENGTH,getRowLength());
#endif #endif
if (_texture)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, _texture->getFilter(osg::Texture::MIN_FILTER));
else
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
glTexSubImage2D(GL_TEXTURE_2D,0, glTexSubImage2D(GL_TEXTURE_2D,0,
_texturePosX,_texturePosY, _texturePosX,_texturePosY,