Page MenuHome
Differential D2294 Diff 7737 source/blender/gpu/intern/gpu_shader.c

Changeset View

Standalone View

View Options

source/blender/gpu/intern/gpu_shader.c

Context not available.
extern char datatoc_gpu_shader_2D_point_uniform_size_smooth_vert_glsl[]; extern char datatoc_gpu_shader_2D_point_uniform_size_smooth_vert_glsl[];
extern char datatoc_gpu_shader_2D_point_uniform_size_outline_smooth_vert_glsl[]; extern char datatoc_gpu_shader_2D_point_uniform_size_outline_smooth_vert_glsl[];
extern char datatoc_gpu_shader_2D_point_uniform_size_varying_color_outline_smooth_vert_glsl[]; extern char datatoc_gpu_shader_2D_point_uniform_size_varying_color_outline_smooth_vert_glsl[];
extern char datatoc_gpu_shader_2D_bezier_curve_vert_glsl[];
extern char datatoc_gpu_shader_2D_bezier_curve_geom_glsl[];
extern char datatoc_gpu_shader_2D_bezier_curve_frag_glsl[];
extern char datatoc_gpu_shader_edges_front_back_persp_vert_glsl[]; extern char datatoc_gpu_shader_edges_front_back_persp_vert_glsl[];
extern char datatoc_gpu_shader_edges_front_back_ortho_vert_glsl[]; extern char datatoc_gpu_shader_edges_front_back_ortho_vert_glsl[];
Context not available.
GPUShader *point_uniform_size_uniform_color_smooth_2D; GPUShader *point_uniform_size_uniform_color_smooth_2D;
GPUShader *point_uniform_size_uniform_color_outline_smooth_2D; GPUShader *point_uniform_size_uniform_color_outline_smooth_2D;
GPUShader *point_uniform_size_varying_color_outline_smooth_2D; GPUShader *point_uniform_size_varying_color_outline_smooth_2D;
GPUShader *bezier_curve_2D;
GPUShader *point_fixed_size_uniform_color_3D; GPUShader *point_fixed_size_uniform_color_3D;
GPUShader *point_fixed_size_varying_color_3D; GPUShader *point_fixed_size_varying_color_3D;
GPUShader *point_varying_size_uniform_color_3D; GPUShader *point_varying_size_uniform_color_3D;
merwinUnsubmitted
Not Done
Inline Actions

Not part of this patch, code just got out of sync.

merwin: Not part of this patch, code just got out of sync.
Context not available.
NULL, NULL, NULL, 0, 0, 0); NULL, NULL, NULL, 0, 0, 0);
retval = GG.shaders.point_uniform_size_varying_color_outline_smooth_2D; retval = GG.shaders.point_uniform_size_varying_color_outline_smooth_2D;
break; break;
case GPU_SHADER_2D_BEZIER_CURVE:
if (!GG.shaders.bezier_curve_2D)
GG.shaders.bezier_curve_2D = GPU_shader_create(
datatoc_gpu_shader_2D_bezier_curve_vert_glsl,
datatoc_gpu_shader_2D_bezier_curve_frag_glsl,
datatoc_gpu_shader_2D_bezier_curve_geom_glsl,
NULL, NULL, 0, 0, 0);
retval = GG.shaders.bezier_curve_2D;
break;
case GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR: case GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR:
if (!GG.shaders.point_fixed_size_uniform_color_3D) if (!GG.shaders.point_fixed_size_uniform_color_3D)
GG.shaders.point_fixed_size_uniform_color_3D = GPU_shader_create( GG.shaders.point_fixed_size_uniform_color_3D = GPU_shader_create(
Context not available.
GG.shaders.point_uniform_size_varying_color_outline_smooth_2D = NULL; GG.shaders.point_uniform_size_varying_color_outline_smooth_2D = NULL;
} }
if (GG.shaders.bezier_curve_2D) {
GPU_shader_free(GG.shaders.bezier_curve_2D);
GG.shaders.bezier_curve_2D = NULL;
}
if (GG.shaders.point_fixed_size_uniform_color_3D) { if (GG.shaders.point_fixed_size_uniform_color_3D) {
GPU_shader_free(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; GG.shaders.point_fixed_size_uniform_color_3D = NULL;
Context not available.