ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use proper depth texture

Browse Source
This commit is contained in:
deve
2016-07-05 11:48:43 +02:00
parent 04d3bfb9a1
commit 93dde11562
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/irrlicht/source/Irrlicht/COGLES2Texture.cpp
View File

@@ -242,7 +242,7 @@ void COGLES2Texture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
// make sure we don't change the internal format of existing matrices
if (!newTexture)
InternalFormat=oldInternalFormat;
Driver->setActiveTexture(0, this);
Driver->getBridgeCalls()->setTexture(0);
@@ -278,7 +278,7 @@ void COGLES2Texture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
// enable bilinear mipmap filter
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
StatesCache.BilinearFilter = true;
StatesCache.TrilinearFilter = false;
StatesCache.MipMapStatus = true;
@@ -292,7 +292,7 @@ void COGLES2Texture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
// enable bilinear filter without mipmaps
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
StatesCache.BilinearFilter = true;
StatesCache.TrilinearFilter = false;
StatesCache.MipMapStatus = false;
@@ -564,18 +564,18 @@ COGLES2FBOTexture::COGLES2FBOTexture(const core::dimension2d<u32>& size,
// generate color texture
glGenTextures(1, &TextureName);
Driver->setActiveTexture(0, this);
Driver->getBridgeCalls()->setTexture(0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
StatesCache.BilinearFilter = true;
StatesCache.BilinearFilter = true;
StatesCache.WrapU = ETC_CLAMP_TO_EDGE;
StatesCache.WrapV = ETC_CLAMP_TO_EDGE;
glTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, ImageSize.Width, ImageSize.Height, 0, PixelFormat, PixelType, 0);
#ifdef _DEBUG
@@ -711,6 +711,7 @@ bool COGLES2FBODepthTexture::attach(ITexture* renderTex)
return false;
}
rtt->DepthTexture=this;
rtt->DepthBufferTexture = DepthRenderBuffer;
grab(); // grab the depth buffer, not the RTT
rtt->unbindRTT();
return true;

1
lib/irrlicht/source/Irrlicht/COGLES2Texture.h
View File

@@ -170,6 +170,7 @@ public:
virtual void unbindRTT();
ITexture* DepthTexture;
GLuint DepthBufferTexture;
protected:
GLuint ColorFrameBuffer;
};

2
src/graphics/texture_manager.cpp
View File

@@ -45,7 +45,7 @@ GLuint getDepthTexture(irr::video::ITexture *tex)
{
assert(tex->isRenderTarget());
#if defined(USE_GLES2)
return 1; //static_cast<irr::video::COGLES2FBODepthTexture*>(tex)->DepthRenderBuffer;
return static_cast<irr::video::COGLES2FBOTexture*>(tex)->DepthBufferTexture;
#else
return static_cast<irr::video::COpenGLFBOTexture*>(tex)->DepthBufferTexture;
#endif