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

From Likasz Izebski, "added support for etc2/eac compression"

Browse Source
This commit is contained in:
Robert Osfield
2013-10-28 12:03:55 +00:00
parent ac383e15c1
commit ff8fe4143e
5 changed files with 142 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/osg/Image
View File

@@ -97,6 +97,19 @@
#define GL_ETC1_RGB8_OES 0x8D64
#endif
#ifndef GL_ARB_ES3_compatibility
#define GL_COMPRESSED_RGB8_ETC2 0x9274
#define GL_COMPRESSED_SRGB8_ETC2 0x9275
#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278
#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
#define GL_COMPRESSED_R11_EAC 0x9270
#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271
#define GL_COMPRESSED_RG11_EAC 0x9272
#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273
#endif
#ifndef GL_DEPTH_COMPONENT
#define GL_DEPTH_COMPONENT 0x1902
#endif

5
include/osg/Texture
View File

@@ -553,6 +553,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
USE_PVRTC_2BPP_COMPRESSION,
USE_PVRTC_4BPP_COMPRESSION,
USE_ETC_COMPRESSION,
USE_ETC2_COMPRESSION,
USE_RGTC1_COMPRESSION,
USE_RGTC2_COMPRESSION,
USE_S3TC_DXT1c_COMPRESSION,
@@ -793,6 +794,9 @@ class OSG_EXPORT Texture : public osg::StateAttribute
void setTextureCompressionETCSupported(bool flag) { _isTextureCompressionETCSupported=flag; }
bool isTextureCompressionETCSupported() const { return _isTextureCompressionETCSupported; }
void setTextureCompressionETC2Supported(bool flag) { _isTextureCompressionETC2Supported=flag; }
bool isTextureCompressionETC2Supported() const { return _isTextureCompressionETC2Supported; }
void setTextureCompressionRGTCSupported(bool flag) { _isTextureCompressionRGTCSupported=flag; }
bool isTextureCompressionRGTCSupported() const { return _isTextureCompressionRGTCSupported; }
@@ -916,6 +920,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
bool _isTextureCompressionPVRTC2BPPSupported;
bool _isTextureCompressionPVRTC4BPPSupported;
bool _isTextureCompressionETCSupported;
bool _isTextureCompressionETC2Supported;
bool _isTextureCompressionRGTCSupported;
bool _isTextureCompressionPVRTCSupported;
bool _isTextureMirroredRepeatSupported;