blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Blender 2.8: Fix some strict aspects on Linux

This commit is contained in:
Sergey Sharybin 2016-09-16 17:18:19 +02:00
parent d96b8e168f
commit 834cb93f40
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/gawain/immediate.c
View File

@ -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);

6
source/blender/gpu/intern/gpu_extensions.c
View File

@ -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);

3
source/blender/gpu/intern/gpu_shader.c
View File

@ -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