[Bf-blender-cvs] [0e95abf74b1] master: Cleanup: order GPUShaderStages (vert, geom, frag)
Campbell Barton
noreply at git.blender.org
Sat Jan 26 00:40:50 CET 2019
Commit: 0e95abf74b1955da38f4f61d7102c0d69663a56c
Author: Campbell Barton
Date: Sat Jan 26 09:46:29 2019 +1100
Branches: master
https://developer.blender.org/rB0e95abf74b1955da38f4f61d7102c0d69663a56c
Cleanup: order GPUShaderStages (vert, geom, frag)
Use names for declarations to support adding defines, coming next.
===================================================================
M source/blender/gpu/intern/gpu_shader.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 5d5084c4eb9..45c0996bcd2 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -187,8 +187,9 @@ static uint g_shaderid = 0;
typedef struct {
const char *vert;
+ /** Optional. */
+ const char *geom;
const char *frag;
- const char *geom; /* geometry stage runs between vert & frag, but is less common, so it goes last */
} GPUShaderStages;
static void shader_print_errors(const char *task, const char *log, const char **code, int totcode)
@@ -676,300 +677,390 @@ int GPU_shader_get_attribute(GPUShader *shader, const char *name)
}
static const GPUShaderStages builtin_shader_stages[GPU_NUM_BUILTIN_SHADERS] = {
- [GPU_SHADER_TEXT] =
- { datatoc_gpu_shader_text_vert_glsl,
- datatoc_gpu_shader_text_frag_glsl,
- datatoc_gpu_shader_text_geom_glsl },
- [GPU_SHADER_TEXT_SIMPLE] =
- { datatoc_gpu_shader_text_simple_vert_glsl,
- datatoc_gpu_shader_text_frag_glsl,
- datatoc_gpu_shader_text_simple_geom_glsl },
- [GPU_SHADER_KEYFRAME_DIAMOND] =
- { datatoc_gpu_shader_keyframe_diamond_vert_glsl,
- datatoc_gpu_shader_keyframe_diamond_frag_glsl },
- [GPU_SHADER_EDGES_FRONT_BACK_PERSP] =
- { datatoc_gpu_shader_edges_front_back_persp_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl, /* this version is */
- datatoc_gpu_shader_edges_front_back_persp_geom_glsl }, /* magical but slooow */
- [GPU_SHADER_EDGES_FRONT_BACK_ORTHO] =
- { datatoc_gpu_shader_edges_front_back_ortho_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl },
- [GPU_SHADER_EDGES_OVERLAY_SIMPLE] =
- { datatoc_gpu_shader_3D_vert_glsl,
- datatoc_gpu_shader_edges_overlay_frag_glsl,
- datatoc_gpu_shader_edges_overlay_simple_geom_glsl },
- [GPU_SHADER_EDGES_OVERLAY] =
- { datatoc_gpu_shader_edges_overlay_vert_glsl,
- datatoc_gpu_shader_edges_overlay_frag_glsl,
- datatoc_gpu_shader_edges_overlay_geom_glsl },
- [GPU_SHADER_SIMPLE_LIGHTING] =
- { datatoc_gpu_shader_3D_normal_vert_glsl,
- datatoc_gpu_shader_simple_lighting_frag_glsl },
+ [GPU_SHADER_TEXT] = {
+ .vert = datatoc_gpu_shader_text_vert_glsl,
+ .geom = datatoc_gpu_shader_text_geom_glsl,
+ .frag = datatoc_gpu_shader_text_frag_glsl,
+ },
+ [GPU_SHADER_TEXT_SIMPLE] = {
+ .vert = datatoc_gpu_shader_text_simple_vert_glsl,
+ .geom = datatoc_gpu_shader_text_simple_geom_glsl,
+ .frag = datatoc_gpu_shader_text_frag_glsl,
+ },
+ [GPU_SHADER_KEYFRAME_DIAMOND] = {
+ .vert = datatoc_gpu_shader_keyframe_diamond_vert_glsl,
+ .frag = datatoc_gpu_shader_keyframe_diamond_frag_glsl,
+ },
+ /* This version is magical but slow! */
+ [GPU_SHADER_EDGES_FRONT_BACK_PERSP] = {
+ .vert = datatoc_gpu_shader_edges_front_back_persp_vert_glsl,
+ .geom = datatoc_gpu_shader_edges_front_back_persp_geom_glsl,
+ .frag = datatoc_gpu_shader_flat_color_frag_glsl,
+ },
+ [GPU_SHADER_EDGES_FRONT_BACK_ORTHO] = {
+ .vert = datatoc_gpu_shader_edges_front_back_ortho_vert_glsl,
+ .frag = datatoc_gpu_shader_flat_color_frag_glsl,
+ },
+ [GPU_SHADER_EDGES_OVERLAY_SIMPLE] = {
+ .vert = datatoc_gpu_shader_3D_vert_glsl,
+ .geom = datatoc_gpu_shader_edges_overlay_simple_geom_glsl,
+ .frag = datatoc_gpu_shader_edges_overlay_frag_glsl,
+ },
+ [GPU_SHADER_EDGES_OVERLAY] = {
+ .vert = datatoc_gpu_shader_edges_overlay_vert_glsl,
+ .geom = datatoc_gpu_shader_edges_overlay_geom_glsl,
+ .frag = datatoc_gpu_shader_edges_overlay_frag_glsl,
+ },
+ [GPU_SHADER_SIMPLE_LIGHTING] = {
+ .vert = datatoc_gpu_shader_3D_normal_vert_glsl,
+ .frag = datatoc_gpu_shader_simple_lighting_frag_glsl,
+ },
/* Use 'USE_FLAT_NORMAL' to make flat shader from smooth */
- [GPU_SHADER_SIMPLE_LIGHTING_FLAT_COLOR] =
- { datatoc_gpu_shader_3D_normal_smooth_color_vert_glsl,
- datatoc_gpu_shader_simple_lighting_smooth_color_frag_glsl },
- [GPU_SHADER_SIMPLE_LIGHTING_SMOOTH_COLOR] =
- { datatoc_gpu_shader_3D_normal_smooth_color_vert_glsl,
- datatoc_gpu_shader_simple_lighting_smooth_color_frag_glsl },
- [GPU_SHADER_SIMPLE_LIGHTING_SMOOTH_COLOR_ALPHA] =
- { datatoc_gpu_shader_3D_normal_smooth_color_vert_glsl,
- datatoc_gpu_shader_simple_lighting_smooth_color_alpha_frag_glsl },
-
- [GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR] =
- { datatoc_gpu_shader_3D_image_vert_glsl,
- datatoc_gpu_shader_image_mask_uniform_color_frag_glsl },
- [GPU_SHADER_3D_IMAGE_MODULATE_ALPHA] =
- { datatoc_gpu_shader_3D_image_vert_glsl,
- datatoc_gpu_shader_image_modulate_alpha_frag_glsl },
- [GPU_SHADER_3D_IMAGE_DEPTH] =
- { datatoc_gpu_shader_3D_image_vert_glsl,
- datatoc_gpu_shader_image_depth_linear_frag_glsl },
- [GPU_SHADER_3D_IMAGE_DEPTH_COPY] =
- { datatoc_gpu_shader_3D_image_vert_glsl,
- datatoc_gpu_shader_image_depth_copy_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_2] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_4] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_8] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_16] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_2_DEPTH_TEST] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_4_DEPTH_TEST] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_8_DEPTH_TEST] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTISAMPLE_16_DEPTH_TEST] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_image_multisample_resolve_frag_glsl },
-
- [GPU_SHADER_2D_IMAGE_INTERLACE] =
- { datatoc_gpu_shader_2D_image_vert_glsl,
- datatoc_gpu_shader_image_interlace_frag_glsl },
- [GPU_SHADER_2D_CHECKER] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_checker_frag_glsl },
-
- [GPU_SHADER_2D_DIAG_STRIPES] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_diag_stripes_frag_glsl },
-
- [GPU_SHADER_2D_UNIFORM_COLOR] =
- { datatoc_gpu_shader_2D_vert_glsl,
- datatoc_gpu_shader_uniform_color_frag_glsl },
- [GPU_SHADER_2D_FLAT_COLOR] =
- { datatoc_gpu_shader_2D_flat_color_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl },
- [GPU_SHADER_2D_SMOOTH_COLOR] =
- { datatoc_gpu_shader_2D_smooth_color_vert_glsl,
- datatoc_gpu_shader_2D_smooth_color_frag_glsl },
- [GPU_SHADER_2D_SMOOTH_COLOR_DITHER] =
- { datatoc_gpu_shader_2D_smooth_color_vert_glsl,
- datatoc_gpu_shader_2D_smooth_color_dithered_frag_glsl },
- [GPU_SHADER_2D_IMAGE_LINEAR_TO_SRGB] =
- { datatoc_gpu_shader_2D_image_vert_glsl,
- datatoc_gpu_shader_image_linear_frag_glsl },
- [GPU_SHADER_2D_IMAGE] =
- { datatoc_gpu_shader_2D_image_vert_glsl,
- datatoc_gpu_shader_image_frag_glsl },
- [GPU_SHADER_2D_IMAGE_COLOR] =
- { datatoc_gpu_shader_2D_image_vert_glsl,
- datatoc_gpu_shader_image_color_frag_glsl },
- [GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] =
- { datatoc_gpu_shader_2D_image_vert_glsl,
- datatoc_gpu_shader_image_desaturate_frag_glsl },
- [GPU_SHADER_2D_IMAGE_ALPHA_COLOR] =
- { datatoc_gpu_shader_2D_image_vert_glsl,
- datatoc_gpu_shader_image_alpha_color_frag_glsl },
- [GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR] =
- { datatoc_gpu_shader_2D_image_vert_glsl,
- datatoc_gpu_shader_image_shuffle_color_frag_glsl },
- [GPU_SHADER_2D_IMAGE_RECT_COLOR] =
- { datatoc_gpu_shader_2D_image_rect_vert_glsl,
- datatoc_gpu_shader_image_color_frag_glsl },
- [GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR] =
- { datatoc_gpu_shader_2D_image_multi_rect_vert_glsl,
- datatoc_gpu_shader_image_varying_color_frag_glsl },
-
- [GPU_SHADER_3D_UNIFORM_COLOR] =
- { datatoc_gpu_shader_3D_vert_glsl,
- datatoc_gpu_shader_uniform_color_frag_glsl },
- [GPU_SHADER_3D_UNIFORM_COLOR_BACKGROUND] =
- { datatoc_gpu_shader_3D_vert_glsl,
- datatoc_gpu_shader_uniform_color_frag_glsl },
- [GPU_SHADER_3D_FLAT_COLOR] =
- { datatoc_gpu_shader_3D_flat_color_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl },
- [GPU_SHADER_3D_SMOOTH_COLOR] =
- { datatoc_gpu_shader_3D_smooth_color_vert_glsl,
- datatoc_gpu_shader_3D_smooth_color_frag_glsl },
- [GPU_SHADER_3D_DEPTH_ONLY] =
- { datatoc_gpu_shader_3D_vert_glsl,
- datatoc_gpu_shader_depth_only_frag_glsl },
- [GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR] =
- { datatoc_gpu_shader_3D_clipped_uniform_color_vert_glsl,
- datatoc_gpu_shader_uniform_color_frag_glsl },
-
- [GPU_SHADER_3D_GROUNDPOINT] =
- { datatoc_gpu_shader_3D_groundpoint_vert_glsl,
- datatoc_gpu_shader_point_uniform_color_frag_glsl },
- [GPU_SHADER_3D_GROUNDLINE] =
- { datatoc_gpu_shader_3D_passthrough_vert_glsl,
- datatoc_gpu_shader_uniform_color_frag_glsl,
- datatoc_gpu_shader_3D_groundline_geom_glsl },
-
- [GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR] =
- { datatoc_gpu_shader_2D_line_dashed_uniform_color_vert_glsl,
- datatoc_gpu_shader_2D_line_dashed_frag_glsl,
- datatoc_gpu_shader_2D_line_dashed_geom_glsl },
- [GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR] =
- { datatoc_gpu_shader_3D_line_dashed_uniform_color_vert_glsl,
- datatoc_gpu_shader_2D_line_dashed_frag_glsl,
- datatoc_gpu_shader_2D_line_dashed_geom_glsl },
-
- [GPU_SHADER_3D_OBJECTSPACE_SIMPLE_LIGHTING_VARIYING_COLOR] =
- { datatoc_gpu_shader_instance_objectspace_variying_color_vert_glsl,
- datatoc_gpu_shader_simple_lighting_frag_glsl},
- [GPU_SHADER_3D_OBJECTSPACE_VARIYING_COLOR] =
- { datatoc_gpu_shader_instance_objectspace_variying_color_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl},
- [GPU_SHADER_3D_SCREENSPACE_VARIYING_COLOR] =
- { datatoc_gpu_shader_instance_screenspace_variying_color_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl},
- [GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED_AXIS] =
- { datatoc_gpu_shader_instance_screen_aligned_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl},
- [GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED] =
- { datatoc_gpu_shader_instance_sc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list