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

12
include/osg/Texture
View File

@@ -90,8 +90,8 @@
#define GL_LUMINANCE_ALPHA16F_ARB 0x881F
#endif
#ifndef GL_ARB_PIXEL_DATA
#define GL_HALF_FLOAT_ARB 0x140B
#ifndef GL_HALF_FLOAT
#define GL_HALF_FLOAT 0x140B
#endif
#ifndef GL_NV_texture_shader
@@ -136,10 +136,6 @@
#define GL_FLOAT_RGBA32_NV 0x888B
#endif
#ifndef GL_NV_half_float
#define GL_HALF_FLOAT_NV 0x140B
#endif
#ifndef GL_ATI_texture_float
#define GL_RGBA_FLOAT32_ATI 0x8814
#define GL_RGB_FLOAT32_ATI 0x8815
@@ -394,10 +390,6 @@
#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF
#endif
#ifndef GL_ARB_half_float_pixel
#define GL_HALF_FLOAT 0x140B
#endif
namespace osg {