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

Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6

Browse Source
This commit is contained in:
Robert Osfield 2018-06-26 20:50:55 +01:00
commit 9d897c2555
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/glu/libutil/mipmap.cpp
View File

@ -3323,6 +3323,7 @@ static GLboolean legalFormat(GLenum format)
case GL_RGBA:
case GL_LUMINANCE:
case GL_LUMINANCE_ALPHA:
case GL_RG:
case GL_BGR:
case GL_BGRA:
return GL_TRUE;
@ -4874,6 +4875,7 @@ static GLint elements_per_group(GLenum format, GLenum type)
case GL_BGR:
return 3;
case GL_LUMINANCE_ALPHA:
case GL_RG:
return 2;
case GL_RGBA:
case GL_BGRA: