blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 746 Projects 19 Wiki Activity

OpenGL: more built-in GPU_SHADERs for points 

No new GLSL shaders were needed! Just combined existing vertex & fragment shaders in new ways.
This commit is contained in:
Mike Erwin 2016-10-06 14:20:20 -04:00
parent 360cb87007
commit edcce96d97
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/GPU_shader.h
View File

@ -105,6 +105,8 @@ typedef enum GPUBuiltinShader {
GPU_SHADER_2D_TEXTURE_2D,
GPU_SHADER_2D_TEXTURE_RECT,
/* points */
GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR,
GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR,
GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR,
GPU_SHADER_3D_POINT_VARYING_SIZE_UNIFORM_COLOR,
GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR,

28
source/blender/gpu/intern/gpu_shader.c
View File

@ -110,6 +110,8 @@ static struct GPUShadersGlobal {
GPUShader *smooth_color_3D;
GPUShader *depth_only_3D;
/* points */
GPUShader *point_fixed_size_uniform_color_2D;
GPUShader *point_fixed_size_uniform_color_3D;
GPUShader *point_fixed_size_varying_color_3D;
GPUShader *point_varying_size_uniform_color_3D;
GPUShader *point_varying_size_varying_color_3D;
@ -719,6 +721,22 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader)
NULL, NULL, NULL, 0, 0, 0);
retval = GG.shaders.depth_only_3D;
break;
case GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR:
if (!GG.shaders.point_fixed_size_uniform_color_2D)
GG.shaders.point_fixed_size_uniform_color_2D = GPU_shader_create(
datatoc_gpu_shader_2D_no_color_vert_glsl,
datatoc_gpu_shader_point_uniform_color_frag_glsl,
NULL, NULL, NULL, 0, 0, 0);
retval = GG.shaders.point_fixed_size_uniform_color_2D;
break;
case GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR:
if (!GG.shaders.point_fixed_size_uniform_color_3D)
GG.shaders.point_fixed_size_uniform_color_3D = GPU_shader_create(
datatoc_gpu_shader_3D_no_color_vert_glsl,
datatoc_gpu_shader_point_uniform_color_frag_glsl,
NULL, NULL, NULL, 0, 0, 0);
retval = GG.shaders.point_fixed_size_uniform_color_3D;
break;
case GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR:
if (!GG.shaders.point_fixed_size_varying_color_3D)
GG.shaders.point_fixed_size_varying_color_3D = GPU_shader_create(
@ -899,6 +917,16 @@ void GPU_shader_free_builtin_shaders(void)
GG.shaders.smooth_color_3D = NULL;
}
if (GG.shaders.point_fixed_size_uniform_color_2D) {
GPU_shader_free(GG.shaders.point_fixed_size_uniform_color_2D);
GG.shaders.point_fixed_size_uniform_color_2D = NULL;
}
if (GG.shaders.point_fixed_size_uniform_color_3D) {
GPU_shader_free(GG.shaders.point_fixed_size_uniform_color_3D);
GG.shaders.point_fixed_size_uniform_color_3D = NULL;
}
if (GG.shaders.point_fixed_size_varying_color_3D) {
GPU_shader_free(GG.shaders.point_fixed_size_varying_color_3D);
GG.shaders.point_fixed_size_varying_color_3D = NULL;