[Bf-blender-cvs] [0d20207771e] blender2.8: Fix GPU build error after recent commit.
Brecht Van Lommel
noreply at git.blender.org
Fri Jul 27 14:18:33 CEST 2018
Commit: 0d20207771e76649fcce3766bcfa1634c087caae
Author: Brecht Van Lommel
Date: Fri Jul 27 14:15:45 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0d20207771e76649fcce3766bcfa1634c087caae
Fix GPU build error after recent commit.
===================================================================
M source/blender/gpu/GPU_extensions.h
M source/blender/gpu/intern/gpu_texture.c
===================================================================
diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h
index d36b0ea15be..f435be7fb34 100644
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_extensions.h
@@ -42,6 +42,7 @@ bool GPU_full_non_power_of_two_support(void);
bool GPU_bicubic_bump_support(void);
int GPU_max_texture_size(void);
+int GPU_max_texture_layers(void);
int GPU_max_textures(void);
float GPU_max_texture_anisotropy(void);
int GPU_max_color_texture_samples(void);
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index f5b52db1c85..e5073196a52 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -160,6 +160,8 @@ static int gpu_get_component_count(GPUTextureFormat format)
/* Definitely not complete, edit according to the gl specification. */
static void gpu_validate_data_format(GPUTextureFormat tex_format, GPUDataFormat data_format)
{
+ (void)data_format;
+
if (ELEM(tex_format,
GPU_DEPTH_COMPONENT24,
GPU_DEPTH_COMPONENT16,
More information about the Bf-blender-cvs
mailing list