Commit f6f335af authored by hybrid's avatar hybrid

Some reindentation, minor bugfixes, removed unused members from ExtensionHandler.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1100 dfc29bdd-3216-0410-991c-e03cc46cb475
parent b2f55c36
This diff is collapsed.
...@@ -15,9 +15,7 @@ namespace video ...@@ -15,9 +15,7 @@ namespace video
COpenGLExtensionHandler::COpenGLExtensionHandler() : COpenGLExtensionHandler::COpenGLExtensionHandler() :
StencilBuffer(false), StencilBuffer(false),
MultiTextureExtension(false), MultiSamplingExtension(false), AnisotropyExtension(false), MultiTextureExtension(false), MultiSamplingExtension(false), AnisotropyExtension(false),
SeparateStencilExtension(false),
TextureCompressionExtension(false), TextureCompressionExtension(false),
VertexBufferObjectExtension(false),
MaxTextureUnits(1), MaxLights(1), MaxIndices(65535), MaxTextureUnits(1), MaxLights(1), MaxIndices(65535),
MaxAnisotropy(1.0f), MaxUserClipPlanes(0), MaxAnisotropy(1.0f), MaxUserClipPlanes(0),
Version(0), ShaderLanguageVersion(0) Version(0), ShaderLanguageVersion(0)
...@@ -102,9 +100,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer) ...@@ -102,9 +100,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
MultiTextureExtension = FeatureAvailable[IRR_ARB_multitexture]; MultiTextureExtension = FeatureAvailable[IRR_ARB_multitexture];
MultiSamplingExtension = FeatureAvailable[IRR_ARB_multisample]; MultiSamplingExtension = FeatureAvailable[IRR_ARB_multisample];
AnisotropyExtension = FeatureAvailable[IRR_EXT_texture_filter_anisotropic]; AnisotropyExtension = FeatureAvailable[IRR_EXT_texture_filter_anisotropic];
SeparateStencilExtension = FeatureAvailable[IRR_ATI_separate_stencil];
TextureCompressionExtension = FeatureAvailable[IRR_ARB_texture_compression]; TextureCompressionExtension = FeatureAvailable[IRR_ARB_texture_compression];
VertexBufferObjectExtension = FeatureAvailable[IRR_ARB_vertex_buffer_object];
StencilBuffer=stencilBuffer; StencilBuffer=stencilBuffer;
#ifdef _IRR_WINDOWS_API_ #ifdef _IRR_WINDOWS_API_
......
...@@ -663,9 +663,7 @@ class COpenGLExtensionHandler ...@@ -663,9 +663,7 @@ class COpenGLExtensionHandler
bool MultiTextureExtension; bool MultiTextureExtension;
bool MultiSamplingExtension; bool MultiSamplingExtension;
bool AnisotropyExtension; bool AnisotropyExtension;
bool SeparateStencilExtension;
bool TextureCompressionExtension; bool TextureCompressionExtension;
bool VertexBufferObjectExtension;
// Some non-boolean properties // Some non-boolean properties
//! Maxmimum texture layers supported by the fixed pipeline //! Maxmimum texture layers supported by the fixed pipeline
......
...@@ -61,13 +61,13 @@ public: ...@@ -61,13 +61,13 @@ public:
//! unlock function //! unlock function
virtual void unlock(); virtual void unlock();
//! Returns original size of the texture. //! Returns original size of the texture (image).
virtual const core::dimension2d<s32>& getOriginalSize() const; virtual const core::dimension2d<s32>& getOriginalSize() const;
//! Returns size of the texture. //! Returns size of the texture.
virtual const core::dimension2d<s32>& getSize() const; virtual const core::dimension2d<s32>& getSize() const;
//! returns driver type of texture (=the driver, who created the texture) //! returns driver type of texture (=the driver, that created it)
virtual E_DRIVER_TYPE getDriverType() const; virtual E_DRIVER_TYPE getDriverType() const;
//! returns color format of texture //! returns color format of texture
...@@ -113,7 +113,7 @@ private: ...@@ -113,7 +113,7 @@ private:
//! \param: newTexture is true if method is called from a newly created texture for the first time. Otherwise call with false to improve memory handling. //! \param: newTexture is true if method is called from a newly created texture for the first time. Otherwise call with false to improve memory handling.
void copyTexture(bool newTexture=true); void copyTexture(bool newTexture=true);
//! returns the size of a texture which would be the optimize size for rendering it //! returns the size of a texture which would be optimal for rendering
inline s32 getTextureSizeFromSurfaceSize(s32 size) const; inline s32 getTextureSizeFromSurfaceSize(s32 size) const;
core::dimension2d<s32> ImageSize; core::dimension2d<s32> ImageSize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment