TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 14:00:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removes some unnecessary extension checks for GL, as those formats are part of 3.2 core. SDL is having some conflicts with extension detection with GL.

Browse source
This commit is contained in:
Areloch 2016-04-08 15:34:02 -05:00
parent 21f5273098
commit b23ac9fb6a
1 changed files with 15 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Engine/source/gfx/gl/gfxGLEnumTranslate.cpp
View file

@ -198,45 +198,25 @@ void GFXGLEnumTranslate::init()
GFXGLTextureSwizzle[GFXFormatL8] = Swizzle_GFXFormatL; // old GL_LUMINANCE8
GFXGLTextureSwizzle[GFXFormatL16] = Swizzle_GFXFormatL; // old GL_LUMINANCE16
if( gglHasExtension(ARB_texture_float) )
{
GFXGLTextureInternalFormat[GFXFormatR32F] = GL_R32F;
GFXGLTextureFormat[GFXFormatR32F] = GL_RED;
GFXGLTextureType[GFXFormatR32F] = GL_FLOAT;
GFXGLTextureInternalFormat[GFXFormatR32F] = GL_R32F;
GFXGLTextureFormat[GFXFormatR32F] = GL_RED;
GFXGLTextureType[GFXFormatR32F] = GL_FLOAT;
GFXGLTextureInternalFormat[GFXFormatR32G32B32A32F] = GL_RGBA32F_ARB;
GFXGLTextureFormat[GFXFormatR32G32B32A32F] = GL_RGBA;
GFXGLTextureType[GFXFormatR32G32B32A32F] = GL_FLOAT;
GFXGLTextureInternalFormat[GFXFormatR32G32B32A32F] = GL_RGBA32F_ARB;
GFXGLTextureFormat[GFXFormatR32G32B32A32F] = GL_RGBA;
GFXGLTextureType[GFXFormatR32G32B32A32F] = GL_FLOAT;
if( gglHasExtension(ARB_half_float_pixel) )
{
GFXGLTextureInternalFormat[GFXFormatR16F] = GL_R16F;
GFXGLTextureFormat[GFXFormatR16F] = GL_RED;
GFXGLTextureType[GFXFormatR16F] = GL_HALF_FLOAT_ARB;
GFXGLTextureInternalFormat[GFXFormatR16F] = GL_R16F;
GFXGLTextureFormat[GFXFormatR16F] = GL_RED;
GFXGLTextureType[GFXFormatR16F] = GL_HALF_FLOAT_ARB;
GFXGLTextureInternalFormat[GFXFormatR16G16F] = GL_RG16F;
GFXGLTextureFormat[GFXFormatR16G16F] = GL_RG;
GFXGLTextureType[GFXFormatR16G16F] = GL_HALF_FLOAT_ARB;
GFXGLTextureInternalFormat[GFXFormatR16G16F] = GL_RG16F;
GFXGLTextureFormat[GFXFormatR16G16F] = GL_RG;
GFXGLTextureType[GFXFormatR16G16F] = GL_HALF_FLOAT_ARB;
GFXGLTextureInternalFormat[GFXFormatR16G16B16A16F] = GL_RGBA16F_ARB;
GFXGLTextureFormat[GFXFormatR16G16B16A16F] = GL_RGBA;
GFXGLTextureType[GFXFormatR16G16B16A16F] = GL_HALF_FLOAT_ARB;
}
else
{
GFXGLTextureInternalFormat[GFXFormatR16F] = GL_R32F;
GFXGLTextureFormat[GFXFormatR16F] = GL_RED;
GFXGLTextureType[GFXFormatR16F] = GL_FLOAT;
GFXGLTextureInternalFormat[GFXFormatR16G16F] = GL_RG32F;
GFXGLTextureFormat[GFXFormatR16G16F] = GL_RG;
GFXGLTextureType[GFXFormatR16G16F] = GL_FLOAT;
GFXGLTextureInternalFormat[GFXFormatR16G16B16A16F] = GL_RGBA32F_ARB;
GFXGLTextureFormat[GFXFormatR16G16B16A16F] = GL_RGBA;
GFXGLTextureType[GFXFormatR16G16B16A16F] = GL_FLOAT;
}
}
GFXGLTextureInternalFormat[GFXFormatR16G16B16A16F] = GL_RGBA16F_ARB;
GFXGLTextureFormat[GFXFormatR16G16B16A16F] = GL_RGBA;
GFXGLTextureType[GFXFormatR16G16B16A16F] = GL_HALF_FLOAT_ARB;
if( gglHasExtension(ARB_ES2_compatibility) )
{