Allow building the game engine with core profile

Note: This is not about functionality, but about using the same stub file we are using in Blender for the game engine.
2017-05-11 15:53:09 +02:00 · 2017-05-11 15:53:09 +02:00 · bde45b5ae7
parent d58310fe37
commit bde45b5ae7
26 changed files with 25 additions and 27 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -579,10 +579,6 @@ if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()

-if(WITH_GAMEENGINE AND NOT WITH_LEGACY_OPENGL)
-	message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_LEGACY_OPENGL")
-endif()
-
 if(NOT WITH_AUDASPACE)
 	if(WITH_OPENAL)
 		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@ -40,7 +40,7 @@
 #  pragma warning (disable:4786)
 #endif

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "KX_BlenderCanvas.h"
 #include "KX_BlenderKeyboardDevice.h"
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
@ -29,7 +29,7 @@
 *  \ingroup blroutines
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "MEM_guardedalloc.h"

--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@ -40,7 +40,7 @@
 #  include <windows.h>
 #endif  /* WIN32 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include <map>

--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@ -36,7 +36,7 @@
 #  include <windows.h>
 #endif

-#include "glew-mx.h"
+#include "GPU_glew.h"
 #include "GPU_extensions.h"
 #include "GPU_init_exit.h"

--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@ -22,7 +22,7 @@
 *  \ingroup ketsji
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include <iostream>
 #include "BL_Shader.h"
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@ -22,7 +22,7 @@
 *  \ingroup ketsji
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include <iostream>
 #include <map>
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@ -22,7 +22,7 @@
 *  \ingroup ketsji
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "KX_BlenderMaterial.h"
 #include "BL_Material.h"
--- a/source/gameengine/Ketsji/KX_Dome.h
+++ b/source/gameengine/Ketsji/KX_Dome.h
@ -38,7 +38,7 @@
 #include "RAS_IRasterizer.h"
 #include "KX_KetsjiEngine.h"

-#include "glew-mx.h"
+#include "GPU_glew.h"
 #include <vector>

 #include "MEM_guardedalloc.h"
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@ -30,7 +30,7 @@
 *  \ingroup ketsji
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #ifdef _MSC_VER
 #  pragma warning (disable:4786)
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@ -37,6 +37,7 @@ set(INC
 	../../SceneGraph
 	../../../blender/blenkernel
 	../../../blender/blenlib
+	../../../blender/gpu
 	../../../blender/makesdna
 	../../../../intern/container
 	../../../../intern/guardedalloc
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@ -31,6 +31,7 @@ set(INC
 	../../blender/makesdna
 	../../blender/blenlib
 	../../blender/blenkernel
+	../../blender/gpu
 	../../blender/imbuf
 	../../../intern/container
 	../../../intern/glew-mx
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@ -43,7 +43,7 @@
 #include "RAS_2DFilterManager.h"
 #include <iostream>

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include <stdio.h>

--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
@ -30,7 +30,7 @@
 #include <windows.h>
 #endif // WIN32

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "RAS_MaterialBucket.h"
 #include "RAS_TexVert.h"
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp
@ -25,7 +25,7 @@
 * ***** END GPL LICENSE BLOCK *****
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include <stdio.h>

--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLOffScreen.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLOffScreen.cpp
@ -25,7 +25,7 @@
 * ***** END GPL LICENSE BLOCK *****
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include <stdio.h>

--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@ -35,7 +35,7 @@
 
 #include "RAS_OpenGLRasterizer.h"

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLSync.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLSync.cpp
@ -25,7 +25,7 @@
 * ***** END GPL LICENSE BLOCK *****
 */

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include <stdio.h>

--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
@ -27,7 +27,7 @@

 #include "RAS_StorageVA.h"

-#include "glew-mx.h"
+#include "GPU_glew.h"

 RAS_StorageVA::RAS_StorageVA(int *texco_num, RAS_IRasterizer::TexCoGen *texco, int *attrib_num, RAS_IRasterizer::TexCoGen *attrib, int *attrib_layer) :
 	m_drawingmode(RAS_IRasterizer::KX_TEXTURED),
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
@ -28,7 +28,7 @@
 #include "RAS_StorageVBO.h"
 #include "RAS_MeshObject.h"

-#include "glew-mx.h"
+#include "GPU_glew.h"

 VBO::VBO(RAS_DisplayArray *data, unsigned int indices)
 {
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
@ -29,7 +29,7 @@
 #define __KX_VERTEXBUFFEROBJECTSTORAGE

 #include <map>
-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "RAS_IStorage.h"
 #include "RAS_IRasterizer.h"
--- a/source/gameengine/VideoTexture/ImageBase.h
+++ b/source/gameengine/VideoTexture/ImageBase.h
@ -40,7 +40,7 @@

 #include "FilterBase.h"

-#include "glew-mx.h"
+#include "GPU_glew.h"

 // forward declarations
 struct PyImage;
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@ -36,7 +36,7 @@
 #include <math.h>


-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "KX_PythonInit.h"
 #include "DNA_scene_types.h"
--- a/source/gameengine/VideoTexture/ImageViewport.cpp
+++ b/source/gameengine/VideoTexture/ImageViewport.cpp
@ -33,7 +33,7 @@
 #include "EXP_PyObjectPlus.h"
 #include <structmember.h>

-#include "glew-mx.h"
+#include "GPU_glew.h"

 #include "KX_PythonInit.h"
 #include "RAS_ICanvas.h"
--- a/source/gameengine/VideoTexture/Texture.cpp
+++ b/source/gameengine/VideoTexture/Texture.cpp
@ -55,7 +55,7 @@
 #include "Exception.h"

 #include <memory.h>
-#include "glew-mx.h"
+#include "GPU_glew.h"

 extern "C" {
 	#include "IMB_imbuf.h"
--- a/source/gameengine/VideoTexture/VideoDeckLink.h
+++ b/source/gameengine/VideoTexture/VideoDeckLink.h
@ -47,7 +47,7 @@ extern "C" {
 #include "BLI_threads.h"
 #include "BLI_blenlib.h"
 }
-#include "GL/glew.h"
+#include "GPU_glew.h"
 #ifdef WIN32
 #include "dvpapi.h"
 #endif