Blender Git Loki

Git Commits -> Revision 2df2799

Revision 2df2799 by Mike Erwin (master)
October 15, 2016, 06:30 (GMT)
OpenGL: new built-in point shader, clean up other shader names

Smooth round point with outline (uniform color) and fill (varying color).

Updated shader naming scheme: a shader that doesn't deal with color does not have to say "no color". Vertex shaders do not have to say "uniform color" since their frag counterpart actually has the uniform. Each name should describe what that shader *does*, not what it *doesn't do*.

Commit Details:

Full Hash: 2df27995f9226245c29007c3dd2eca61cb31fc69
Parent Commit: 48db354
Lines Changed: +205, -115

7 Added Paths:

/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_smooth_vert.glsl (+29, -0) (View)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_smooth_vert.glsl (+26, -0) (View)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_varying_color_outline_smooth_vert.glsl (+34, -0) (View)
/source/blender/gpu/shaders/gpu_shader_2D_vert.glsl (+13, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_vert.glsl (+16, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_vert.glsl (+13, -0) (View)
/source/blender/gpu/shaders/gpu_shader_point_varying_color_outline_smooth_frag.glsl (+37, -0) (View)

5 Deleted Paths:

/source/blender/gpu/shaders/gpu_shader_2D_no_color_vert.glsl (+0, -13)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_uniform_color_outline_smooth_vert.glsl (+0, -29)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_uniform_color_smooth_vert.glsl (+0, -26)
/source/blender/gpu/shaders/gpu_shader_3D_no_color_vert.glsl (+0, -13)
/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_no_color_vert.glsl (+0, -16)

3 Modified Paths:

/source/blender/gpu/CMakeLists.txt (+7, -5) (Diff)
/source/blender/gpu/GPU_shader.h (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+29, -13) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021