[Bf-blender-cvs] [3bb720a7de4] blender2.8: GPUShader: Cleanup: Remove unused uniform_interface.

Clément Foucault noreply at git.blender.org
Wed Mar 28 00:43:39 CEST 2018


Commit: 3bb720a7de4ae7363ce45e8218e29095e1913be5
Author: Clément Foucault
Date:   Tue Mar 27 23:51:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3bb720a7de4ae7363ce45e8218e29095e1913be5

GPUShader: Cleanup: Remove unused uniform_interface.

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

M	source/blender/gpu/intern/gpu_shader.c
M	source/blender/gpu/intern/gpu_shader_private.h

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

diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 2cb3476d568..f8339802eeb 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -530,9 +530,6 @@ void GPU_shader_free(GPUShader *shader)
 	if (shader->program)
 		glDeleteProgram(shader->program);
 
-	if (shader->uniform_interface)
-		MEM_freeN(shader->uniform_interface);
-
 	if (shader->interface)
 		GWN_shaderinterface_discard(shader->interface);
 
diff --git a/source/blender/gpu/intern/gpu_shader_private.h b/source/blender/gpu/intern/gpu_shader_private.h
index f883773df17..67d8c6e6213 100644
--- a/source/blender/gpu/intern/gpu_shader_private.h
+++ b/source/blender/gpu/intern/gpu_shader_private.h
@@ -35,9 +35,6 @@ struct GPUShader {
 	GLuint geometry; /* handle for geometry shader */
 	GLuint fragment; /* handle for fragment shader */
 
-	void *uniform_interface; /* cached uniform interface for shader. Data depends on shader */
-	/* NOTE: ^-- only FX compositing shaders use this */
-
 	Gwn_ShaderInterface *interface; /* cached uniform & attrib interface for shader */
 };



More information about the Bf-blender-cvs mailing list