diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2016-10-13 18:17:17 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2016-10-13 18:17:17 +0300 |
commit | 916e631fc905182734d65f79c5a64a1f57abde22 (patch) | |
tree | 208225c3e8efbe603e5cdf84eaf3f1828bcf6f29 /source/blender/gpu | |
parent | 35793504815a1cd0eb38df54d9ae99cc441b4f2f (diff) |
Fix compiling with Blenderplayer
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_immediate.h | 4 | ||||
-rw-r--r-- | source/blender/gpu/gawain/immediate.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_matrix.c | 3 |
3 files changed, 5 insertions, 4 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; |