diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-16 18:18:19 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-16 18:18:19 +0300 |
| commit | 834cb93f4059973595fcb7a579e4ad369c1a430c (patch) | |
| tree | 368b91343404ea45daf763ff2759ed770a59d63c /source/blender | |
| parent | d96b8e168f3c809cd79f6028dbf99eeeebb71302 (diff) | |
Blender 2.8: Fix some strict aspects on Linux
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/gpu/gawain/immediate.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 6 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/gpu/gawain/immediate.c b/source/blender/gpu/gawain/immediate.c index 650bccb9248..6ae531bf451 100644 --- a/source/blender/gpu/gawain/immediate.c +++ b/source/blender/gpu/gawain/immediate.c @@ -243,7 +243,7 @@ Batch* immBeginBatchAtMost(GLenum prim_type, unsigned vertex_ct) #endif // IMM_BATCH_COMBO -static void immDrawSetup() +static void immDrawSetup(void) { // set up VAO -- can be done during Begin or End really glBindVertexArray(imm.vao_id); diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 0a4b111d824..26c863d9ed4 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -129,9 +129,9 @@ void GPU_get_dfdy_factors(float fac[2]) void gpu_extensions_init(void) { BLI_assert(GLEW_VERSION_3_0 || /* Mesa mininum requirement */ - GLEW_VERSION_2_1 && GLEW_EXT_gpu_shader4 /* Mac minimum requirement */ - && GLEW_ARB_framebuffer_object - && GLEW_APPLE_flush_buffer_range); + (GLEW_VERSION_2_1 && GLEW_EXT_gpu_shader4 /* Mac minimum requirement */ + && GLEW_ARB_framebuffer_object + && GLEW_APPLE_flush_buffer_range)); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &GG.maxtextures); diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index e9a5732950a..dd576a1fcf7 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -37,9 +37,10 @@ #include "GPU_debug.h" #include "GPU_extensions.h" #include "GPU_shader.h" -#include "GPU_shader_private.h" #include "GPU_texture.h" +#include "gpu_shader_private.h" + /* TODO(sergey): Find better default values for this constants. */ #define MAX_DEFINE_LENGTH 1024 #define MAX_EXT_DEFINE_LENGTH 1024 |