From 7ae7a994b430e1c71908f7b4f7c57534ff2aa9cf Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 17 Aug 2018 10:31:46 +0100 Subject: [PATCH] Merged changes to InternalPixelRelations sizedInternalFormats[] from master --- src/osg/Texture.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 78f9c032b..8d89bfc9a 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -137,6 +137,7 @@ InternalPixelRelations sizedInternalFormats[] = { , { 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_2_10_10_10_REV } , { 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_2_10_10_10_REV } // , { GL_RGBA16F , GL_RGBA , GL_HALF_FLOAT } - // , { GL_RGBA16F , GL_RGBA , GL_FLOAT } - // , { GL_RGBA32F , GL_RGBA , GL_FLOAT } + , { GL_RGBA16F , GL_RGBA , GL_FLOAT } + , { GL_RGBA32F , GL_RGBA , GL_FLOAT } , { GL_SRGB8 , GL_RGB , GL_UNSIGNED_BYTE } , { GL_SRGB8_ALPHA8 , GL_RGBA , GL_UNSIGNED_BYTE }