[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49484] branches/soc-2012-swiss_cheese/ source: Added GPU_matrix.h into GPU_compatibility.h

[Jason Wilkins]

Revision: 49484
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49484
Author:   jwilkins
Date:     2012-08-01 20:15:22 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Added GPU_matrix.h into GPU_compatibility.h

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
    branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp

Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-08-01 20:15:22 UTC (rev 49484)
@@ -51,7 +51,6 @@
 #include "blf_internal.h"
 
 #include "GPU_compatibility.h"
-#include "GPU_matrix.h"
 
 
 /* Max number of font in memory.

Modified: branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c	2012-08-01 20:15:22 UTC (rev 49484)
@@ -107,7 +107,6 @@
 #include "GPU_extensions.h"
 #include "GPU_draw.h"
 #include "GPU_compatibility.h"
-#include "GPU_matrix.h"
 #include "GPU_object.h"
 #include "GPU_functions.h"
 

Modified: branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_Canvas.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_Canvas.h	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_Canvas.h	2012-08-01 20:15:22 UTC (rev 49484)
@@ -40,8 +40,7 @@
 	#include <windows.h>
 #endif // WIN32
 
-#include <GL/glew.h>
-#include "GPU_matrix.h"
+#include "GPU_compatibility.h"
 
 #include <map>
 

Modified: branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2012-08-01 20:15:22 UTC (rev 49484)
@@ -99,7 +99,7 @@
 #include "GHOST_IWindow.h"
 #include "GHOST_Rect.h"
 
-#include "GPU_matrix.h"
+#include "GPU_compatibility.h"
 #include "GPU_object.h"
 #include "GPU_functions.h"
 

Modified: branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.cpp	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.cpp	2012-08-01 20:15:22 UTC (rev 49484)
@@ -3,9 +3,6 @@
  */
 // ------------------------------------
 
-#include "GPU_matrix.h"
-#include <GL/glew.h>
-
 #include <iostream>
 #include <map>
 #include <stdlib.h>
@@ -29,6 +26,8 @@
 #define spit(x) std::cout << x << std::endl;
 
 #include "MEM_guardedalloc.h"
+
+#include "GPU_compatibility.h"
 #include "GPU_draw.h"
 
 extern "C" {
@@ -38,18 +37,6 @@
 	void my_free_envmapdata(EnvMap *env);
 }
 
-// (n&(n-1)) zeros the least significant bit of n 
-static int is_power_of_2_i(int num)
-{
-	return ((num)&(num-1))==0;
-}
-static int power_of_2_min_i(int num)
-{
-	while (!is_power_of_2_i(num))
-		num= num&(num-1);
-	return num;	
-}
-
 // Place holder for a full texture manager
 class BL_TextureObject
 {

Modified: branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BlenderMaterial.cpp	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BlenderMaterial.cpp	2012-08-01 20:15:22 UTC (rev 49484)
@@ -23,14 +23,12 @@
 #include "RAS_IRasterizer.h"
 #include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
 
+#include "GPU_compatibility.h"
 #include "GPU_draw.h"
-#include "GPU_matrix.h"
+#include "GPU_extensions.h"
 
-
 #include "STR_HashedString.h"
 
-#include "GPU_extensions.h"
-
 // ------------------------------------
 #include "DNA_object_types.h"
 #include "DNA_material_types.h"

Modified: branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2012-08-01 20:15:22 UTC (rev 49484)
@@ -41,16 +41,15 @@
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
 #include "RAS_2DFilterManager.h"
-#include <iostream>
 
-#include "GPU_matrix.h"
-#include <stdio.h>
-
 #include "Value.h"
 
-#include "GPU_extensions.h"
 #include "GPU_compatibility.h"
+#include "GPU_extensions.h"
 
+#include <iostream>
+#include <stdio.h>
+
 RAS_2DFilterManager::RAS_2DFilterManager():
 texturewidth(-1), textureheight(-1),
 canvaswidth(-1), canvasheight(-1),

Modified: branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp	2012-08-01 20:15:22 UTC (rev 49484)
@@ -31,11 +31,9 @@
 
 #include "GPU_extensions.h"
 
-#include "GPU_matrix.h"
 #include "RAS_StorageVA.h"
 
 #include "GPU_compatibility.h"
-
 #include "GPU_material.h"
 #include "GPU_object.h"
 #include "GPU_functions.h"

Modified: branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp	2012-08-01 20:14:27 UTC (rev 49483)
+++ branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp	2012-08-01 20:15:22 UTC (rev 49484)
@@ -30,8 +30,8 @@
 #include "RAS_StorageVBO.h"
 #include "RAS_MeshObject.h"
 
+#include "GPU_compatibility.h"
 #include "GPU_extensions.h"
-#include "GPU_matrix.h"
 
 #include "GPU_object.h"
 #include "GPU_functions.h"