Skip to content

D
deprecated-irrlicht-mac
You need to sign in or sign up before continuing.
Commit c661079e authored by hybrid's avatar hybrid
Browse files
Options

FBO patch from Nadro for better ATI support. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1402 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 2c1aa553
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 51 deletions
source/Irrlicht/COpenGLDriver.cpp
View file @ c661079e
...@@ -2493,7 +2493,7 @@ ITexture* COpenGLDriver::createRenderTargetTexture(const core::dimension2d<s32>& ...@@ -2493,7 +2493,7 @@ ITexture* COpenGLDriver::createRenderTargetTexture(const core::dimension2d<s32>&
#if defined(GL_EXT_framebuffer_object) #if defined(GL_EXT_framebuffer_object)
// if driver supports FrameBufferObjects, use them // if driver supports FrameBufferObjects, use them
if (queryFeature(EVDF_FRAMEBUFFER_OBJECT)) if (queryFeature(EVDF_FRAMEBUFFER_OBJECT))
rtt = new COpenGLTexture(size, FeatureAvailable[IRR_EXT_packed_depth_stencil], name, this); rtt = new COpenGLTexture(size, name, this);
else else
#endif #endif
{ {
......
source/Irrlicht/COpenGLExtensionHandler.h
View file @ c661079e
...@@ -659,6 +659,12 @@ class COpenGLExtensionHandler ...@@ -659,6 +659,12 @@ class COpenGLExtensionHandler
//! queries the features of the driver, returns true if feature is available //! queries the features of the driver, returns true if feature is available
bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const; bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
//! queries the features of the driver, returns true if feature is available
bool queryOpenGLFeature(EOpenGLFeatures feature) const
{
return FeatureAvailable[feature];
}
//! show all features with availablity //! show all features with availablity
void dump() const; void dump() const;
......
source/Irrlicht/COpenGLTexture.cpp
View file @ c661079e
...@@ -29,8 +29,9 @@ static bool checkFBOStatus(COpenGLDriver* Driver); ...@@ -29,8 +29,9 @@ static bool checkFBOStatus(COpenGLDriver* Driver);
COpenGLTexture::COpenGLTexture(IImage* origImage, const char* name, COpenGLDriver* driver) COpenGLTexture::COpenGLTexture(IImage* origImage, const char* name, COpenGLDriver* driver)
: ITexture(name), Driver(driver), Image(0), : ITexture(name), Driver(driver), Image(0),
TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_BGRA_EXT), TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_BGRA_EXT),
PixelType(GL_UNSIGNED_BYTE), HasMipMaps(true), IsRenderTarget(false), PixelType(GL_UNSIGNED_BYTE),
ColorFrameBuffer(0), DepthRenderBuffer(0), StencilRenderBuffer(0), Locks(0) ColorFrameBuffer(0), DepthRenderBuffer(0), StencilRenderBuffer(0), Locks(0),
HasMipMaps(true), IsRenderTarget(false), AutomaticMipmapUpdate(false), UseStencil(false)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("COpenGLTexture"); setDebugName("COpenGLTexture");
...@@ -47,15 +48,16 @@ COpenGLTexture::COpenGLTexture(IImage* origImage, const char* name, COpenGLDrive ...@@ -47,15 +48,16 @@ COpenGLTexture::COpenGLTexture(IImage* origImage, const char* name, COpenGLDrive
} }
//! ColorFrameBuffer constructor //! RTT ColorFrameBuffer constructor
COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size, COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size,
bool extPackedDepthStencilSupported,
const char* name, const char* name,
COpenGLDriver* driver) COpenGLDriver* driver,
bool useStencil)
: ITexture(name), ImageSize(size), Driver(driver), Image(0), : ITexture(name), ImageSize(size), Driver(driver), Image(0),
TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA), TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA),
PixelType(GL_UNSIGNED_BYTE), HasMipMaps(false), IsRenderTarget(true), PixelType(GL_UNSIGNED_BYTE),
ColorFrameBuffer(0), DepthRenderBuffer(0), StencilRenderBuffer(0), Locks(0) ColorFrameBuffer(0), DepthRenderBuffer(0), StencilRenderBuffer(0), Locks(0),
HasMipMaps(false), IsRenderTarget(true), AutomaticMipmapUpdate(false), UseStencil(useStencil)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("COpenGLTexture_FBO"); setDebugName("COpenGLTexture_FBO");
...@@ -70,45 +72,56 @@ COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size, ...@@ -70,45 +72,56 @@ COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size,
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
#ifdef GL_EXT_packed_depth_stencil if (useStencil)
if (extPackedDepthStencilSupported)
{ {
// generate packed depth stencil texture #ifdef GL_EXT_packed_depth_stencil
glGenTextures(1, &DepthRenderBuffer); if (Driver->queryOpenGLFeature(COpenGLExtensionHandler::IRR_EXT_packed_depth_stencil))
glBindTexture(GL_TEXTURE_2D, DepthRenderBuffer); {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); // generate packed depth stencil texture
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_STENCIL_EXT, ImageSize.Width, glGenTextures(1, &DepthRenderBuffer);
ImageSize.Height, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0); glBindTexture(GL_TEXTURE_2D, DepthRenderBuffer);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_STENCIL_EXT, ImageSize.Width,
StencilRenderBuffer = DepthRenderBuffer; // stencil is packed with depth ImageSize.Height, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0);
} glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
else // generate separate stencil and depth textures glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
StencilRenderBuffer = DepthRenderBuffer; // stencil is packed with depth
}
else // generate separate stencil and depth textures
#endif #endif
{
// generate depth texture
glGenTextures(1, &DepthRenderBuffer);
glBindTexture(GL_TEXTURE_2D, DepthRenderBuffer);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, ImageSize.Width,
ImageSize.Height, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
// we 're in trouble! the code below does not complete
// the FBO currently... stencil buffer is only
// supported with EXT_packed_depth_stencil extension
// (above)
// // generate stencil texture
// glGenTextures(1, &StencilRenderBuffer);
// glBindTexture(GL_TEXTURE_2D, StencilRenderBuffer);
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
// glTexImage2D(GL_TEXTURE_2D, 0, GL_STENCIL_INDEX, ImageSize.Width,
// ImageSize.Height, 0, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, 0);
// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
}
}
#ifdef GL_EXT_framebuffer_object
else
{ {
// generate depth texture // generate depth buffer
glGenTextures(1, &DepthRenderBuffer); Driver->extGlGenFramebuffers(1, &DepthRenderBuffer);
glBindTexture(GL_TEXTURE_2D, DepthRenderBuffer); Driver->extGlBindRenderbuffer(GL_RENDERBUFFER_EXT, DepthRenderBuffer);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, ImageSize.Width,
ImageSize.Height, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
// we 're in trouble! the code below does not complete the FBO currently...
// stencil buffer is only supported with EXT_packed_depth_stencil extension (above)
// // generate stencil texture
// glGenTextures(1, &StencilRenderBuffer);
// glBindTexture(GL_TEXTURE_2D, StencilRenderBuffer);
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
// glTexImage2D(GL_TEXTURE_2D, 0, GL_STENCIL_INDEX, ImageSize.Width,
// ImageSize.Height, 0, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, 0);
// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
} }
#ifdef GL_EXT_framebuffer_object
// generate frame buffer // generate frame buffer
Driver->extGlGenFramebuffers(1, &ColorFrameBuffer); Driver->extGlGenFramebuffers(1, &ColorFrameBuffer);
Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, ColorFrameBuffer); Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, ColorFrameBuffer);
...@@ -122,15 +135,23 @@ COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size, ...@@ -122,15 +135,23 @@ COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size,
// attach depth texture to depth buffer // attach depth texture to depth buffer
Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT, Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
GL_DEPTH_ATTACHMENT_EXT, GL_DEPTH_ATTACHMENT_EXT,
GL_TEXTURE_2D, useStencil?GL_TEXTURE_2D:GL_RENDERBUFFER_EXT,
DepthRenderBuffer, DepthRenderBuffer,
0); 0);
// attach stencil texture to stencil buffer if (useStencil)
Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT, {
// attach stencil texture to stencil buffer
Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
GL_STENCIL_ATTACHMENT_EXT, GL_STENCIL_ATTACHMENT_EXT,
GL_TEXTURE_2D, GL_TEXTURE_2D,
StencilRenderBuffer, StencilRenderBuffer,
0); 0);
}
else
Driver->extGlRenderbufferStorage(GL_RENDERBUFFER_EXT,
GL_DEPTH_COMPONENT, ImageSize.Width,
ImageSize.Height);
glGetError(); glGetError();
// check the status // check the status
...@@ -141,7 +162,12 @@ COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size, ...@@ -141,7 +162,12 @@ COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size,
if (ColorFrameBuffer) if (ColorFrameBuffer)
Driver->extGlDeleteFramebuffers(1, &ColorFrameBuffer); Driver->extGlDeleteFramebuffers(1, &ColorFrameBuffer);
if (DepthRenderBuffer) if (DepthRenderBuffer)
glDeleteTextures(1, &DepthRenderBuffer); {
if (useStencil)
glDeleteTextures(1, &DepthRenderBuffer);
else
Driver->extGlDeleteRenderbuffers(1, &DepthRenderBuffer);
}
if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer) if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer)
glDeleteTextures(1, &StencilRenderBuffer); glDeleteTextures(1, &StencilRenderBuffer);
ColorFrameBuffer = 0; ColorFrameBuffer = 0;
...@@ -158,8 +184,10 @@ COpenGLTexture::~COpenGLTexture() ...@@ -158,8 +184,10 @@ COpenGLTexture::~COpenGLTexture()
{ {
if (ColorFrameBuffer) if (ColorFrameBuffer)
Driver->extGlDeleteFramebuffers(1, &ColorFrameBuffer); Driver->extGlDeleteFramebuffers(1, &ColorFrameBuffer);
if (DepthRenderBuffer) if (DepthRenderBuffer && UseStencil)
glDeleteTextures(1, &DepthRenderBuffer); glDeleteTextures(1, &DepthRenderBuffer);
else
Driver->extGlDeleteRenderbuffers(1, &DepthRenderBuffer);
if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer) if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer)
glDeleteTextures(1, &StencilRenderBuffer); glDeleteTextures(1, &StencilRenderBuffer);
......
source/Irrlicht/COpenGLTexture.h
View file @ c661079e
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
//! constructor //! constructor
COpenGLTexture(IImage* surface, const char* name, COpenGLDriver* driver=0); COpenGLTexture(IImage* surface, const char* name, COpenGLDriver* driver=0);
//! FrameBufferObject constructor //! FrameBufferObject constructor
COpenGLTexture(const core::dimension2d<s32>& size, bool extPackedDepthStencilSupported, const char* name, COpenGLDriver* driver=0); COpenGLTexture(const core::dimension2d<s32>& size, const char* name, COpenGLDriver* driver=0, bool useStencil=false);
//! destructor //! destructor
virtual ~COpenGLTexture(); virtual ~COpenGLTexture();
...@@ -124,15 +124,17 @@ private: ...@@ -124,15 +124,17 @@ private:
GLint InternalFormat; GLint InternalFormat;
GLenum PixelFormat; GLenum PixelFormat;
GLenum PixelType; GLenum PixelType;
bool HasMipMaps;
bool IsRenderTarget;
bool AutomaticMipmapUpdate;
GLuint ColorFrameBuffer; // for FBO path GLuint ColorFrameBuffer; // for FBO path
GLuint DepthRenderBuffer; // for FBO path GLuint DepthRenderBuffer; // for FBO path
GLuint StencilRenderBuffer; // for FBO path GLuint StencilRenderBuffer; // for FBO path
u32 Locks; u32 Locks;
bool HasMipMaps;
bool IsRenderTarget;
bool AutomaticMipmapUpdate;
bool UseStencil;
}; };
......
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