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

Standardized use of GL_HALF_FLOAT_NV and GL_HALF_FLOAT_ARB to GL_HALF_FLOAT

Browse Source
This commit is contained in:
Robert Osfield
2013-01-31 16:26:06 +00:00
parent 9bc3b3316a
commit 6ec15736cd
5 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/exr/ReaderWriterEXR.cpp
View File

@@ -103,7 +103,7 @@ unsigned char *exr_load(std::istream& fin,
/*RgbaChannels channels =*/ rgbafile.channels();
(*width_ret) = width = dw.max.x - dw.min.x + 1;
(*height_ret)=height = dw.max.y - dw.min.y + 1;
(*dataType_ret) = GL_HALF_FLOAT_ARB;
(*dataType_ret) = GL_HALF_FLOAT;
pixels.resizeErase (height, width);
@@ -261,7 +261,7 @@ protected:
writeOK = false;
return false;
}
if (!( dataType == GL_HALF_FLOAT_ARB ||
if (!( dataType == GL_HALF_FLOAT ||
dataType == GL_FLOAT))
{
writeOK = false;
@@ -274,7 +274,7 @@ protected:
//Copy data from texture to rgba pixel format
Array2D<Rgba> outPixels(height,width);
//If texture is half format
if (dataType == GL_HALF_FLOAT_ARB)
if (dataType == GL_HALF_FLOAT)
{
for (long i = height-1; i >= 0; i--)
{
@@ -361,7 +361,7 @@ protected:
int t = height_ret;
int r = 1;
if (dataType_ret == GL_HALF_FLOAT_ARB)
if (dataType_ret == GL_HALF_FLOAT)
{
interNalTextureFormat =
numComponents_ret == 1 ? GL_LUMINANCE16F_ARB :