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

Merged changes to InternalPixelRelations sizedInternalFormats[] from master

Browse Source
This commit is contained in:
Robert Osfield 2018-08-17 10:31:46 +01:00
parent 3808b298d1
commit 7ae7a994b4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osg/Texture.cpp
View File

@ -137,6 +137,7 @@ InternalPixelRelations sizedInternalFormats[] = {
, { GL_RGBA8 , GL_RGBA , GL_UNSIGNED_BYTE } , { GL_RGBA8 , GL_RGBA , GL_UNSIGNED_BYTE }
, { GL_RGBA16 , GL_RGBA , GL_UNSIGNED_SHORT }
, { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_10_10_10_2 } , { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_10_10_10_2 }
, { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_2_10_10_10_REV } , { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_2_10_10_10_REV }
, { GL_RGBA12 , GL_RGBA , GL_UNSIGNED_SHORT } , { GL_RGBA12 , GL_RGBA , GL_UNSIGNED_SHORT }
@ -149,8 +150,8 @@ InternalPixelRelations sizedInternalFormats[] = {
, { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_INT_10_10_10_2 } , { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_INT_10_10_10_2 }
, { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_INT_2_10_10_10_REV } , { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_INT_2_10_10_10_REV }
// , { GL_RGBA16F , GL_RGBA , GL_HALF_FLOAT } // , { GL_RGBA16F , GL_RGBA , GL_HALF_FLOAT }
// , { GL_RGBA16F , GL_RGBA , GL_FLOAT } , { GL_RGBA16F , GL_RGBA , GL_FLOAT }
// , { GL_RGBA32F , GL_RGBA , GL_FLOAT } , { GL_RGBA32F , GL_RGBA , GL_FLOAT }
, { GL_SRGB8 , GL_RGB , GL_UNSIGNED_BYTE } , { GL_SRGB8 , GL_RGB , GL_UNSIGNED_BYTE }
, { GL_SRGB8_ALPHA8 , GL_RGBA , GL_UNSIGNED_BYTE } , { GL_SRGB8_ALPHA8 , GL_RGBA , GL_UNSIGNED_BYTE }