[Bf-blender-cvs] [0fe5a789837] blender2.8: Fix T58949: Transform feedback shaders not having fragment shader

Clément Foucault noreply at git.blender.org
Fri Dec 7 21:19:16 CET 2018


Commit: 0fe5a789837394d54c1a7570ef1e46c8ab3b0830
Author: Clément Foucault
Date:   Fri Dec 7 21:19:02 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB0fe5a789837394d54c1a7570ef1e46c8ab3b0830

Fix T58949: Transform feedback shaders not having fragment shader

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

M	source/blender/draw/intern/draw_manager_shader.c

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

diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index a2583045ade..e8d693aa7c0 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -47,6 +47,7 @@
 
 extern char datatoc_gpu_shader_2D_vert_glsl[];
 extern char datatoc_gpu_shader_3D_vert_glsl[];
+extern char datatoc_gpu_shader_depth_only_frag_glsl[];
 extern char datatoc_common_fullscreen_vert_glsl[];
 
 #define USE_DEFERRED_COMPILATION 1
@@ -295,7 +296,9 @@ GPUShader *DRW_shader_create_with_transform_feedback(
         const char *vert, const char *geom, const char *defines,
         const GPUShaderTFBType prim_type, const char **varying_names, const int varying_count)
 {
-	return GPU_shader_create_ex(vert, NULL, geom, NULL, defines,
+	return GPU_shader_create_ex(vert,
+	                            datatoc_gpu_shader_depth_only_frag_glsl,
+	                            geom, NULL, defines,
 	                            prim_type, varying_names, varying_count, __func__);
 }



More information about the Bf-blender-cvs mailing list