[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15144] trunk/blender/source/gameengine/ Rasterizer/RAS_2DFilterManager.cpp: fix 2dfilter problem on AMD64, Patches item #13626

Hamed Zaghaghi hamed.zaghaghi at gmail.com
Fri Jun 6 03:28:53 CEST 2008


Revision: 15144
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15144
Author:   zaghaghi
Date:     2008-06-06 03:28:51 +0200 (Fri, 06 Jun 2008)

Log Message:
-----------
fix 2dfilter problem on AMD64, Patches item #13626

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

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2008-06-05 23:01:03 UTC (rev 15143)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2008-06-06 01:28:51 UTC (rev 15144)
@@ -1,350 +1,351 @@
-/**
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
- 
-#define STRINGIFY(A)  #A
-
-#include "RAS_OpenGLFilters/RAS_Blur2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Sharpen2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Dilation2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Erosion2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Laplacian2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Sobel2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Prewitt2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_GrayScale2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Sepia2DFilter.h"
-#include "RAS_OpenGLFilters/RAS_Invert2DFilter.h"
-
-#include "STR_String.h"
-#include "RAS_ICanvas.h"
-#include "RAS_2DFilterManager.h"
-#include <iostream>
-
-#ifdef WIN32
-// OpenGL gl.h needs 'windows.h' on windows platforms 
-#include <windows.h>
-#endif //WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
-
-#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-RAS_2DFilterManager::RAS_2DFilterManager():
-texturewidth(-1), textureheight(-1),
-canvaswidth(-1), canvasheight(-1),
-numberoffilters(0),texname(-1)
-{
-	isshadersupported = bgl::QueryVersion(2,0);
-	if(!isshadersupported)
-	{
-		std::cout<<"shaders not supported!" << std::endl;
-		return;
-	}
-
-	int passindex;
-	for(passindex =0; passindex<MAX_RENDER_PASS; passindex++)
-	{
-		m_filters[passindex] = 0;
-		m_enabled[passindex] = 0;
-	}
-
-}
-
-RAS_2DFilterManager::~RAS_2DFilterManager()
-{
-}
-
-unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
-{
-		GLuint program = 0;	
-#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
-		GLuint fShader = bgl::blCreateShaderObjectARB(GL_FRAGMENT_SHADER);
-        GLint success;
-
-		bgl::blShaderSourceARB(fShader, 1, (const char**)&shadersource, NULL);
-
-		bgl::blCompileShaderARB(fShader);
-
-		bgl::blGetObjectParameterivARB(fShader, GL_COMPILE_STATUS, &success);
-		if(!success)
-		{
-			/*Shader Comile Error*/
-			std::cout << "2dFilters - Shader compile error" << std::endl;
-			return 0;
-		}
-		    
-		program = bgl::blCreateProgramObjectARB();
-		bgl::blAttachObjectARB(program, fShader);
-
-		bgl::blLinkProgramARB(program);
-		bgl::blGetObjectParameterivARB(program, GL_LINK_STATUS, &success);
-		if (!success)
-		{
-			/*Program Link Error*/
-			std::cout << "2dFilters - Shader program link error" << std::endl;
-			return 0;
-		}
-   		
-		bgl::blValidateProgramARB(program);
-		bgl::blGetObjectParameterivARB(program, GL_VALIDATE_STATUS, &success);
-        if (!success)
-		{
-			/*Program Validation Error*/
-			std::cout << "2dFilters - Shader program validation error" << std::endl;
-			return 0;
-		}
-#endif
-		return program;
-}
-
-unsigned int RAS_2DFilterManager::CreateShaderProgram(int filtermode)
-{
-		switch(filtermode)
-		{
-			case RAS_2DFILTER_BLUR:
-				return CreateShaderProgram(BlurFragmentShader);
-			case RAS_2DFILTER_SHARPEN:
-				return CreateShaderProgram(SharpenFragmentShader);
-			case RAS_2DFILTER_DILATION:
-				return CreateShaderProgram(DilationFragmentShader);
-			case RAS_2DFILTER_EROSION:
-				return CreateShaderProgram(ErosionFragmentShader);
-			case RAS_2DFILTER_LAPLACIAN:
-				return CreateShaderProgram(LaplacionFragmentShader);
-			case RAS_2DFILTER_SOBEL:
-				return CreateShaderProgram(SobelFragmentShader);
-			case RAS_2DFILTER_PREWITT:
-				return CreateShaderProgram(PrewittFragmentShader);
-			case RAS_2DFILTER_GRAYSCALE:
-				return CreateShaderProgram(GrayScaleFragmentShader);
-			case RAS_2DFILTER_SEPIA:
-				return CreateShaderProgram(SepiaFragmentShader);
-			case RAS_2DFILTER_INVERT:
-				return CreateShaderProgram(InvertFragmentShader);
-		}
-		return 0;
-}
-
-void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
-{
+/**
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+#define STRINGIFY(A)  #A
+
+#include "RAS_OpenGLFilters/RAS_Blur2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Sharpen2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Dilation2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Erosion2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Laplacian2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Sobel2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Prewitt2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_GrayScale2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Sepia2DFilter.h"
+#include "RAS_OpenGLFilters/RAS_Invert2DFilter.h"
+
+#include "STR_String.h"
+#include "RAS_ICanvas.h"
+#include "RAS_2DFilterManager.h"
+#include <iostream>
+
+#ifdef WIN32
+// OpenGL gl.h needs 'windows.h' on windows platforms 
+#include <windows.h>
+#endif //WIN32
+#ifdef __APPLE__
+#define GL_GLEXT_LEGACY 1
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+
+#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
+RAS_2DFilterManager::RAS_2DFilterManager():
+texturewidth(-1), textureheight(-1),
+canvaswidth(-1), canvasheight(-1),
+numberoffilters(0),texname(-1)
+{
+	isshadersupported = bgl::QueryVersion(2,0);
+	if(!isshadersupported)
+	{
+		std::cout<<"shaders not supported!" << std::endl;
+		return;
+	}
+
+	int passindex;
+	for(passindex =0; passindex<MAX_RENDER_PASS; passindex++)
+	{
+		m_filters[passindex] = 0;
+		m_enabled[passindex] = 0;
+	}
+
+}
+
+RAS_2DFilterManager::~RAS_2DFilterManager()
+{
+}
+
+unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
+{
+		GLuint program = 0;	
 #if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
-	GLint uniformLoc;
-	bgl::blUseProgramObjectARB(shaderprogram);
+		GLuint fShader = bgl::blCreateShaderObjectARB(GL_FRAGMENT_SHADER);
+        GLint success;
+
+		bgl::blShaderSourceARB(fShader, 1, (const char**)&shadersource, NULL);
+
+		bgl::blCompileShaderARB(fShader);
+
+		bgl::blGetObjectParameterivARB(fShader, GL_COMPILE_STATUS, &success);
+		if(!success)
+		{
+			/*Shader Comile Error*/
+			std::cout << "2dFilters - Shader compile error" << std::endl;
+			return 0;
+		}
+		    
+		program = bgl::blCreateProgramObjectARB();
+		bgl::blAttachObjectARB(program, fShader);
+
+		bgl::blLinkProgramARB(program);
+		bgl::blGetObjectParameterivARB(program, GL_LINK_STATUS, &success);
+		if (!success)
+		{
+			/*Program Link Error*/
+			std::cout << "2dFilters - Shader program link error" << std::endl;
+			return 0;
+		}
+   		
+		bgl::blValidateProgramARB(program);
+		bgl::blGetObjectParameterivARB(program, GL_VALIDATE_STATUS, &success);
+        if (!success)
+		{
+			/*Program Validation Error*/
+			std::cout << "2dFilters - Shader program validation error" << std::endl;
+			return 0;
+		}
+#endif
+		return program;
+}
+
+unsigned int RAS_2DFilterManager::CreateShaderProgram(int filtermode)
+{
+		switch(filtermode)
+		{
+			case RAS_2DFILTER_BLUR:
+				return CreateShaderProgram(BlurFragmentShader);
+			case RAS_2DFILTER_SHARPEN:
+				return CreateShaderProgram(SharpenFragmentShader);
+			case RAS_2DFILTER_DILATION:
+				return CreateShaderProgram(DilationFragmentShader);
+			case RAS_2DFILTER_EROSION:
+				return CreateShaderProgram(ErosionFragmentShader);
+			case RAS_2DFILTER_LAPLACIAN:
+				return CreateShaderProgram(LaplacionFragmentShader);
+			case RAS_2DFILTER_SOBEL:
+				return CreateShaderProgram(SobelFragmentShader);
+			case RAS_2DFILTER_PREWITT:
+				return CreateShaderProgram(PrewittFragmentShader);
+			case RAS_2DFILTER_GRAYSCALE:
+				return CreateShaderProgram(GrayScaleFragmentShader);
+			case RAS_2DFILTER_SEPIA:
+				return CreateShaderProgram(SepiaFragmentShader);
+			case RAS_2DFILTER_INVERT:
+				return CreateShaderProgram(InvertFragmentShader);
+		}
+		return 0;
+}
+
+void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
+{
+#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
+	GLint uniformLoc;
+	bgl::blUseProgramObjectARB(shaderprogram);

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list