Commit: 834cb93f4059973595fcb7a579e4ad369c1a430c Author: Sergey Sharybin Date: Fri Sep 16 17:18:19 2016 +0200 Branches: blender2.8 https://developer.blender.org/rB834cb93f4059973595fcb7a579e4ad369c1a430c
Blender 2.8: Fix some strict aspects on Linux =================================================================== M source/blender/gpu/gawain/immediate.c M source/blender/gpu/intern/gpu_extensions.c M source/blender/gpu/intern/gpu_shader.c =================================================================== diff --git a/source/blender/gpu/gawain/immediate.c b/source/blender/gpu/gawain/immediate.c index 650bccb..6ae531b 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 0a4b111..26c863d 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 e9a5732..dd576a1 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 _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs