Fix compiling with Blenderplayer

5 files changed, 18 insertions, 5 deletions

diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h
index 96b8cbb22b0..cce5f519c76 100644
--- a/source/blender/gpu/GPU_immediate.h
+++ b/source/blender/gpu/GPU_immediate.h
@@ -36,10 +36,10 @@
 
 /* Extend immBindProgram to use Blender’s library of built-in shader programs.
  * Use immUnbindProgram() when done. */
-void immBindBuiltinProgram(GPUBuiltinShader);
+void immBindBuiltinProgram(GPUBuiltinShader shader_id);
 
 /*
  * Extend immUniformColor to take Blender's themes
  */
 void immUniformThemeColor(int colorid);
-void immUniformThemeColorShade(int colorid, int offset);
\ No newline at end of file
+void immUniformThemeColorShade(int colorid, int offset);
diff --git a/source/blender/gpu/gawain/immediate.h b/source/blender/gpu/gawain/immediate.h
index 956ea6bd562..d71532bcac7 100644
--- a/source/blender/gpu/gawain/immediate.h
+++ b/source/blender/gpu/gawain/immediate.h
@@ -26,7 +26,7 @@ void immBeginAtMost(GLenum primitive, unsigned max_vertex_ct); // can supply few
 void immEnd(void); // finishes and draws
 
 #if IMM_BATCH_COMBO
-#include "gawain/batch.h"
+#include "batch.h"
 // immBegin a batch, then use standard immFunctions as usual.
 // immEnd will finalize the batch instead of drawing.
 // Then you can draw it as many times as you like! Partially replaces the need for display lists.
diff --git a/source/blender/gpu/intern/gpu_matrix.c b/source/blender/gpu/intern/gpu_matrix.c
index a1921a1c638..9abce9d6816 100644
--- a/source/blender/gpu/intern/gpu_matrix.c
+++ b/source/blender/gpu/intern/gpu_matrix.c
@@ -90,7 +90,8 @@ void gpuMatrixBegin3D()
 }
 
 #if SUPPORT_LEGACY_MATRIX
-void gpuMatrixBegin3D_legacy() {
+void gpuMatrixBegin3D_legacy()
+{
 	/* copy top matrix from each legacy stack into new fresh stack */
 	state.mode = MATRIX_MODE_3D;
 	state.top = 0;
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index 0e570e19258..d2c2129532a 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -35,11 +35,12 @@ set(INC
 	../../blender/blenloader
 	../../blender/makesdna
 	../../blender/makesrna
+	../../../intern/glew-mx
 	../../../intern/guardedalloc
 )
 
 set(INC_SYS
-	
+	${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 20d3697053b..aabcad65750 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -178,6 +178,8 @@ struct wmWindowManager;
 #include "../blender/editors/include/UI_resources.h"
 #include "../blender/editors/include/UI_view2d.h"
 #include "../blender/freestyle/FRS_freestyle.h"
+#include "../blender/gpu/GPU_immediate.h"
+#include "../blender/gpu/GPU_matrix.h"
 #include "../blender/python/BPY_extern.h"
 #include "../blender/render/extern/include/RE_engine.h"
 #include "../blender/render/extern/include/RE_pipeline.h"
@@ -778,4 +780,13 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rende
 bool RE_RenderResult_is_stereo(RenderResult *res) RET_ZERO
 void uiTemplateImageViews(uiLayout *layout, struct PointerRNA *imfptr) RET_NONE
 
+/* GPU */
+void gpuMatrixBegin3D_legacy(void) RET_NONE
+void gpuMatrixEnd() RET_NONE
+void gpuMultMatrix3D(const float m[4][4]) RET_NONE
+void gpuTranslate3fv(const float vec[3]) RET_NONE
+void gpuScale3fv(const float vec[3]) RET_NONE
+void gpuRotateAxis(float deg, char axis) RET_NONE
+void immBindBuiltinProgram(GPUBuiltinShader shader_id) RET_NONE
+
 #endif // WITH_GAMEENGINE