[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49326] trunk/blender/source/gameengine/ Rasterizer: BGE: Fixing a performance regression with 2D filters.

[Mitchell Stokes]

Revision: 49326
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49326
Author:   moguri
Date:     2012-07-28 09:45:39 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
BGE: Fixing a performance regression with 2D filters. My changes caused a check to fail every frame resulting in constant recreation of textures.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2012-07-28 08:59:03 UTC (rev 49325)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2012-07-28 09:45:39 UTC (rev 49326)
@@ -52,7 +52,6 @@
 
 RAS_2DFilterManager::RAS_2DFilterManager():
 texturewidth(-1), textureheight(-1),
-canvaswidth(-1), canvasheight(-1),
 /* numberoffilters(0), */ /* UNUSED */ need_tex_update(true)
 {
 	isshadersupported = GLEW_ARB_shader_objects &&
@@ -404,7 +403,7 @@
 	RAS_Rect rect = canvas->GetWindowArea();
 	int rect_width = rect.GetWidth()+1, rect_height = rect.GetHeight()+1;
 
-	if (canvaswidth != canvas->GetWidth() || canvasheight != canvas->GetHeight())
+	if (texturewidth != rect_width || textureheight != rect_height)
 	{
 		UpdateOffsetMatrix(canvas);
 		UpdateCanvasTextureCoord((unsigned int*)viewport);

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h	2012-07-28 08:59:03 UTC (rev 49325)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h	2012-07-28 09:45:39 UTC (rev 49326)
@@ -62,8 +62,6 @@
 	unsigned int	texname[3]; 
 	int				texturewidth;
 	int				textureheight;
-	int				canvaswidth;
-	int				canvasheight;
 	/* int				numberoffilters; */ /* UNUSED */
 	/* bit 0: enable/disable depth texture
 	 * bit 1: enable/disable luminance texture*/