1 files changed, 16 insertions, 9 deletions

diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 958fead33ce..ef206332057 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -43,6 +43,7 @@
 
 #include "STR_String.h"
 #include "RAS_ICanvas.h"
+#include "RAS_Rect.h"
 #include "RAS_2DFilterManager.h"
 #include <iostream>
 
@@ -158,7 +159,8 @@ void	RAS_2DFilterManager::AnalyseShader(int passindex, vector<STR_String>& propN
 	texflag[passindex] = 0;
 	if(glGetUniformLocationARB(m_filters[passindex], "bgl_DepthTexture") != -1)
 	{
-		texflag[passindex] |= 0x1;
+		if(GLEW_ARB_depth_texture)
+			texflag[passindex] |= 0x1;
 	}
 	if(glGetUniformLocationARB(m_filters[passindex], "bgl_LuminanceTexture") != -1)
 	{
@@ -261,7 +263,7 @@ void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance)
 	
 	glGenTextures(1, (GLuint*)&texname[0]);
 	glBindTexture(GL_TEXTURE_2D, texname[0]);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texturewidth, textureheight, 0, GL_RGB,
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texturewidth, textureheight, 0, GL_RGBA,
 			GL_UNSIGNED_BYTE, 0);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -293,10 +295,13 @@ void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance)
 	}
 }
 
-void RAS_2DFilterManager::UpdateOffsetMatrix(int width, int height)
+void RAS_2DFilterManager::UpdateOffsetMatrix(RAS_ICanvas* canvas)
 {
-	canvaswidth = texturewidth = width;
-	canvasheight = textureheight = height;
+	RAS_Rect canvas_rect = canvas->GetWindowArea();
+	canvaswidth = canvas->GetWidth();
+	canvasheight = canvas->GetHeight();
+	texturewidth = canvaswidth + canvas_rect.GetLeft();
+	textureheight = canvasheight + canvas_rect.GetBottom();
 
 	GLint i,j;
 	i = 0;
@@ -352,7 +357,7 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
 
 	if(canvaswidth != canvas->GetWidth() || canvasheight != canvas->GetHeight())
 	{
-		UpdateOffsetMatrix(canvas->GetWidth(), canvas->GetHeight());
+		UpdateOffsetMatrix(canvas);
 		SetupTextures(need_depth, need_luminance);
 	}
 	GLuint	viewport[4]={0};
@@ -360,19 +365,21 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
 	if(need_depth){
 		glActiveTextureARB(GL_TEXTURE1);
 		glBindTexture(GL_TEXTURE_2D, texname[1]);
-		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_DEPTH_COMPONENT, 0,0, texturewidth,textureheight, 0);
+		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_DEPTH_COMPONENT, 0, 0, texturewidth,textureheight, 0);
 	}
 	
 	if(need_luminance){
 		glActiveTextureARB(GL_TEXTURE2);
 		glBindTexture(GL_TEXTURE_2D, texname[2]);
-		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0,0, texturewidth,textureheight, 0);
+		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0, 0 , texturewidth,textureheight, 0);
 	}
 
 	glGetIntegerv(GL_VIEWPORT,(GLint *)viewport);
-	glViewport(0, 0, texturewidth, textureheight);
+	glViewport(0,0, texturewidth, textureheight);
 
 	glDisable(GL_DEPTH_TEST);
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);