diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-20 18:39:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-20 18:41:20 +0300 |
commit | 1b79d323d95567de4be595409b5994d993d5154b (patch) | |
tree | adfdbe11372baed0e6c5339995c1e17521333199 | |
parent | 4f881e0d974e051f22926680501f80913f6cb2d4 (diff) |
Cleanup: move gawain header out of GPU_matrix
Avoids requiring glew headers in Python API.
-rw-r--r-- | source/blender/editors/interface/interface.c | 1 | ||||
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 1 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_utils.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_clip/space_clip.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 1 | ||||
-rw-r--r-- | source/blender/gpu/GPU_matrix.h | 5 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_matrix.c | 4 |
8 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index bea59649440..2e6d6984c70 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -56,6 +56,7 @@ #include "BKE_screen.h" #include "BKE_idprop.h" +#include "GPU_glew.h" #include "GPU_matrix.h" #include "BLF_api.h" diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index adb58ac6c92..47e8a64cb0b 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -74,6 +74,7 @@ #include "GPU_compositing.h" #include "GPU_framebuffer.h" +#include "GPU_glew.h" #include "GPU_matrix.h" #include "render_intern.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 17ecb309e27..c432990d4c3 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -61,6 +61,7 @@ #include "RNA_access.h" #include "RNA_define.h" +#include "GPU_glew.h" #include "GPU_matrix.h" #include "IMB_colormanagement.h" diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 1872fe108ca..f185eea6d32 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -60,6 +60,7 @@ #include "IMB_imbuf.h" +#include "GPU_glew.h" #include "GPU_matrix.h" #include "WM_api.h" diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index c02925078a6..5ac3aa15d4c 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -94,6 +94,7 @@ #include "UI_interface.h" #include "GPU_draw.h" +#include "GPU_glew.h" #include "GPU_matrix.h" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 4be03e31b0d..e6b7970a0d4 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -54,6 +54,7 @@ #include "BIF_glutil.h" +#include "GPU_glew.h" #include "GPU_select.h" #include "GPU_matrix.h" diff --git a/source/blender/gpu/GPU_matrix.h b/source/blender/gpu/GPU_matrix.h index 4e136ed34b2..f22c0cd5c4d 100644 --- a/source/blender/gpu/GPU_matrix.h +++ b/source/blender/gpu/GPU_matrix.h @@ -33,12 +33,13 @@ #define __GPU_MATRIX_H__ #include "BLI_sys_types.h" -#include "../../../intern/gawain/gawain/gwn_shader_interface.h" #ifdef __cplusplus extern "C" { #endif +struct Gwn_ShaderInterface; + void gpuMatrixReset(void); /* to Identity transform & empty stack */ /* ModelView Matrix (2D or 3D) */ @@ -110,7 +111,7 @@ const float (*gpuGetNormalMatrixInverse(float m[3][3]))[3]; /* set uniform values for currently bound shader */ -void gpuBindMatrices(const Gwn_ShaderInterface*); +void gpuBindMatrices(const struct Gwn_ShaderInterface *); bool gpuMatricesDirty(void); /* since last bind */ diff --git a/source/blender/gpu/intern/gpu_matrix.c b/source/blender/gpu/intern/gpu_matrix.c index 7f024a18ba7..38a55020a5e 100644 --- a/source/blender/gpu/intern/gpu_matrix.c +++ b/source/blender/gpu/intern/gpu_matrix.c @@ -29,6 +29,8 @@ * \ingroup gpu */ +#include "../../../intern/gawain/gawain/gwn_shader_interface.h" + #define SUPPRESS_GENERIC_MATRIX_API #define USE_GPU_PY_MATRIX_API /* only so values are declared */ #include "GPU_matrix.h" @@ -556,7 +558,7 @@ const float (*gpuGetNormalMatrixInverse(float m[3][3]))[3] return m; } -void gpuBindMatrices(const Gwn_ShaderInterface* shaderface) +void gpuBindMatrices(const Gwn_ShaderInterface *shaderface) { /* set uniform values to matrix stack values * call this before a draw call if desired matrices are dirty |