Blender Git Loki
Git Commits -> Revision 70ff63e
Revision 70ff63e by Mike Erwin (master) October 18, 2016, 04:08 (GMT) |
OpenGL: tweak image shaders & code that uses them - rename image shaders to describe exactly what they do - rename inputs to match other built-in shaders - set & use active texture unit - no need to enable/disable textures with GLSL - pull vertex format setup out of loops |
Commit Details:
Full Hash: 70ff63e63fc3a63dccc6a6c567bbc347c64d6c7d
Parent Commit: 0c6939f
Lines Changed: +118, -112
3 Added Paths:
/source/blender/gpu/shaders/gpu_shader_3D_image_vert.glsl (+18, -0) (View)
/source/blender/gpu/shaders/gpu_shader_image_modulate_alpha_frag.glsl (+18, -0) (View)
/source/blender/gpu/shaders/gpu_shader_image_rect_modulate_alpha_frag.glsl (+18, -0) (View)
/source/blender/gpu/shaders/gpu_shader_image_modulate_alpha_frag.glsl (+18, -0) (View)
/source/blender/gpu/shaders/gpu_shader_image_rect_modulate_alpha_frag.glsl (+18, -0) (View)
3 Deleted Paths:
/source/blender/gpu/shaders/gpu_shader_2D_texture_2D_frag.glsl (+0, -17)
/source/blender/gpu/shaders/gpu_shader_2D_texture_rect_frag.glsl (+0, -17)
/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl (+0, -19)
/source/blender/gpu/shaders/gpu_shader_2D_texture_rect_frag.glsl (+0, -17)
/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl (+0, -19)
6 Modified Paths:
/source/blender/editors/space_view3d/drawobject.c (+4, -4) (Diff)
/source/blender/gpu/CMakeLists.txt (+3, -3) (Diff)
/source/blender/gpu/GPU_shader.h (+3, -3) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+24, -24) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+6, -7) (Diff)
/source/blender/windowmanager/intern/wm_stereo.c (+24, -18) (Diff)
/source/blender/gpu/CMakeLists.txt (+3, -3) (Diff)
/source/blender/gpu/GPU_shader.h (+3, -3) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+24, -24) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+6, -7) (Diff)
/source/blender/windowmanager/intern/wm_stereo.c (+24, -18) (Diff)