[Bf-blender-cvs] [6acf8642e5c] blender2.8: Cleanup: remove unused GPU code.

Brecht Van Lommel noreply at git.blender.org
Tue Sep 11 11:54:09 CEST 2018


Commit: 6acf8642e5c464a0879cf37e3f39cd3e526a2019
Author: Brecht Van Lommel
Date:   Tue Sep 11 11:34:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6acf8642e5c464a0879cf37e3f39cd3e526a2019

Cleanup: remove unused GPU code.

===================================================================

M	source/blender/gpu/GPU_extensions.h
M	source/blender/gpu/intern/gpu_extensions.c
M	source/blender/gpu/intern/gpu_shader.c

===================================================================

diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h
index f435be7fb34..23ac95775d7 100644
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_extensions.h
@@ -38,9 +38,6 @@ extern "C" {
 
 /* GPU extensions support */
 
-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);
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 0c2f11b1f74..112618de92d 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -265,18 +265,6 @@ void gpu_extensions_exit(void)
 	GPU_invalid_tex_free();
 }
 
-bool GPU_full_non_power_of_two_support(void)
-{
-	/* always supported on full GL but still relevant for OpenGL ES 2.0 where
-	 * NPOT textures can't use mipmaps or repeat wrap mode */
-	return true;
-}
-
-bool GPU_bicubic_bump_support(void)
-{
-	return GLEW_VERSION_4_0 || (GLEW_ARB_texture_query_lod && GLEW_VERSION_3_0);
-}
-
 int GPU_color_depth(void)
 {
 	return GG.colordepth;
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 486858b9c82..67825c9cbaf 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -258,9 +258,6 @@ static void gpu_shader_standard_defines(
 	else if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_ANY, GPU_DRIVER_ANY))
 		strcat(defines, "#define GPU_INTEL\n");
 
-	if (GPU_bicubic_bump_support())
-		strcat(defines, "#define BUMP_BICUBIC\n");
-
 #ifdef WITH_OPENSUBDIV
 	/* TODO(sergey): Check whether we actually compiling shader for
 	 * the OpenSubdiv mesh.



More information about the Bf-blender-cvs mailing list