[Bf-blender-cvs] [1858535a105] master: GPUShader: Add meaningful debug names to builtin shaders
Clément Foucault
noreply at git.blender.org
Wed Sep 16 01:40:59 CEST 2020
Commit: 1858535a105c306282d95d1894f4f8dc088d17e4
Author: Clément Foucault
Date: Wed Sep 16 01:40:04 2020 +0200
Branches: master
https://developer.blender.org/rB1858535a105c306282d95d1894f4f8dc088d17e4
GPUShader: Add meaningful debug names to builtin shaders
This makes the debugging easier.
===================================================================
M source/blender/gpu/GPU_shader.h
M source/blender/gpu/intern/gpu_shader_builtin.c
===================================================================
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 64695dfe3fb..9aaa5d4cae8 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -72,6 +72,10 @@ struct GPUShader *GPU_shader_create_from_arrays_impl(
GPU_shader_create_from_arrays_impl( \
&(const struct GPU_ShaderCreateFromArray_Params)__VA_ARGS__, __func__, __LINE__)
+#define GPU_shader_create_from_arrays_named(name, ...) \
+ GPU_shader_create_from_arrays_impl( \
+ &(const struct GPU_ShaderCreateFromArray_Params)__VA_ARGS__, name, 0)
+
void GPU_shader_free(GPUShader *shader);
void GPU_shader_bind(GPUShader *shader);
diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index f528e67a80a..63eae109f01 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -152,6 +152,7 @@ const struct GPUShaderConfigData GPU_shader_cfg_data[GPU_SHADER_CFG_LEN] = {
static GPUShader *builtin_shaders[GPU_SHADER_CFG_LEN][GPU_SHADER_BUILTIN_LEN] = {{NULL}};
typedef struct {
+ const char *name;
const char *vert;
/** Optional. */
const char *geom;
@@ -163,116 +164,138 @@ typedef struct {
static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
[GPU_SHADER_TEXT] =
{
+ .name = "GPU_SHADER_TEXT",
.vert = datatoc_gpu_shader_text_vert_glsl,
.frag = datatoc_gpu_shader_text_frag_glsl,
},
[GPU_SHADER_KEYFRAME_DIAMOND] =
{
+ .name = "GPU_SHADER_KEYFRAME_DIAMOND",
.vert = datatoc_gpu_shader_keyframe_diamond_vert_glsl,
.frag = datatoc_gpu_shader_keyframe_diamond_frag_glsl,
},
[GPU_SHADER_SIMPLE_LIGHTING] =
{
+ .name = "GPU_SHADER_SIMPLE_LIGHTING",
.vert = datatoc_gpu_shader_3D_normal_vert_glsl,
.frag = datatoc_gpu_shader_simple_lighting_frag_glsl,
},
[GPU_SHADER_2D_CHECKER] =
{
+ .name = "GPU_SHADER_2D_CHECKER",
.vert = datatoc_gpu_shader_2D_vert_glsl,
.frag = datatoc_gpu_shader_checker_frag_glsl,
},
[GPU_SHADER_2D_DIAG_STRIPES] =
{
+ .name = "GPU_SHADER_2D_DIAG_STRIPES",
.vert = datatoc_gpu_shader_2D_vert_glsl,
.frag = datatoc_gpu_shader_diag_stripes_frag_glsl,
},
[GPU_SHADER_2D_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_2D_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_2D_vert_glsl,
.frag = datatoc_gpu_shader_uniform_color_frag_glsl,
},
[GPU_SHADER_2D_FLAT_COLOR] =
{
+ .name = "GPU_SHADER_2D_FLAT_COLOR",
.vert = datatoc_gpu_shader_2D_flat_color_vert_glsl,
.frag = datatoc_gpu_shader_flat_color_frag_glsl,
},
[GPU_SHADER_2D_SMOOTH_COLOR] =
{
+ .name = "GPU_SHADER_2D_SMOOTH_COLOR",
.vert = datatoc_gpu_shader_2D_smooth_color_vert_glsl,
.frag = datatoc_gpu_shader_2D_smooth_color_frag_glsl,
},
[GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE] =
{
+ .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
.vert = datatoc_gpu_shader_2D_image_vert_glsl,
.frag = datatoc_gpu_shader_image_overlays_merge_frag_glsl,
},
[GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] =
{
+ .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
.vert = datatoc_gpu_shader_2D_vert_glsl,
.frag = datatoc_gpu_shader_image_overlays_stereo_merge_frag_glsl,
},
[GPU_SHADER_2D_IMAGE] =
{
+ .name = "GPU_SHADER_2D_IMAGE",
.vert = datatoc_gpu_shader_2D_image_vert_glsl,
.frag = datatoc_gpu_shader_image_frag_glsl,
},
[GPU_SHADER_2D_IMAGE_COLOR] =
{
+ .name = "GPU_SHADER_2D_IMAGE_COLOR",
.vert = datatoc_gpu_shader_2D_image_vert_glsl,
.frag = datatoc_gpu_shader_image_color_frag_glsl,
},
[GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] =
{
+ .name = "GPU_SHADER_2D_IMAGE_DESATURATE_COLOR",
.vert = datatoc_gpu_shader_2D_image_vert_glsl,
.frag = datatoc_gpu_shader_image_desaturate_frag_glsl,
},
[GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR] =
{
+ .name = "GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR",
.vert = datatoc_gpu_shader_2D_image_vert_glsl,
.frag = datatoc_gpu_shader_image_shuffle_color_frag_glsl,
},
[GPU_SHADER_2D_IMAGE_RECT_COLOR] =
{
+ .name = "GPU_SHADER_2D_IMAGE_RECT_COLOR",
.vert = datatoc_gpu_shader_2D_image_rect_vert_glsl,
.frag = datatoc_gpu_shader_image_color_frag_glsl,
},
[GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR] =
{
+ .name = "GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR",
.vert = datatoc_gpu_shader_2D_image_multi_rect_vert_glsl,
.frag = datatoc_gpu_shader_image_varying_color_frag_glsl,
},
[GPU_SHADER_3D_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_3D_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_3D_vert_glsl,
.frag = datatoc_gpu_shader_uniform_color_frag_glsl,
},
[GPU_SHADER_3D_FLAT_COLOR] =
{
+ .name = "GPU_SHADER_3D_FLAT_COLOR",
.vert = datatoc_gpu_shader_3D_flat_color_vert_glsl,
.frag = datatoc_gpu_shader_flat_color_frag_glsl,
},
[GPU_SHADER_3D_SMOOTH_COLOR] =
{
+ .name = "GPU_SHADER_3D_SMOOTH_COLOR",
.vert = datatoc_gpu_shader_3D_smooth_color_vert_glsl,
.frag = datatoc_gpu_shader_3D_smooth_color_frag_glsl,
},
[GPU_SHADER_3D_DEPTH_ONLY] =
{
+ .name = "GPU_SHADER_3D_DEPTH_ONLY",
.vert = datatoc_gpu_shader_3D_vert_glsl,
.frag = datatoc_gpu_shader_depth_only_frag_glsl,
},
[GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_3D_clipped_uniform_color_vert_glsl,
.frag = datatoc_gpu_shader_uniform_color_frag_glsl,
},
[GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_3D_polyline_vert_glsl,
.geom = datatoc_gpu_shader_3D_polyline_geom_glsl,
.frag = datatoc_gpu_shader_3D_polyline_frag_glsl,
@@ -280,6 +303,7 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
},
[GPU_SHADER_3D_POLYLINE_CLIPPED_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_3D_POLYLINE_CLIPPED_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_3D_polyline_vert_glsl,
.geom = datatoc_gpu_shader_3D_polyline_geom_glsl,
.frag = datatoc_gpu_shader_3D_polyline_frag_glsl,
@@ -288,6 +312,7 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
},
[GPU_SHADER_3D_POLYLINE_FLAT_COLOR] =
{
+ .name = "GPU_SHADER_3D_POLYLINE_FLAT_COLOR",
.vert = datatoc_gpu_shader_3D_polyline_vert_glsl,
.geom = datatoc_gpu_shader_3D_polyline_geom_glsl,
.frag = datatoc_gpu_shader_3D_polyline_frag_glsl,
@@ -295,6 +320,7 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
},
[GPU_SHADER_3D_POLYLINE_SMOOTH_COLOR] =
{
+ .name = "GPU_SHADER_3D_POLYLINE_SMOOTH_COLOR",
.vert = datatoc_gpu_shader_3D_polyline_vert_glsl,
.geom = datatoc_gpu_shader_3D_polyline_geom_glsl,
.frag = datatoc_gpu_shader_3D_polyline_frag_glsl,
@@ -303,73 +329,87 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
[GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_2D_line_dashed_uniform_color_vert_glsl,
.frag = datatoc_gpu_shader_2D_line_dashed_frag_glsl,
},
[GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_3D_line_dashed_uniform_color_vert_glsl,
.frag = datatoc_gpu_shader_2D_line_dashed_frag_glsl,
},
[GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR] =
{
+ .name = "GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR",
.vert = datatoc_gpu_shader_2D_vert_glsl,
.frag = datatoc_gpu_shader_point_uniform_color_frag_glsl,
},
[GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR] =
{
+ .name = "GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR",
.vert = datatoc_gpu_shader_2D_point_varying_size_varying_color_vert_glsl,
.frag = datatoc_gpu_shader_point_varying_color_frag_glsl,
},
[GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA] =
{
+ .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA",
.vert = datatoc_gpu_shader_2D_point_uniform_size_aa_vert_glsl,
.frag = datatoc_gpu_shader_point_uniform_color_aa_frag_glsl,
},
[GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA] =
{
+ .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA",
.vert = datatoc_gpu_shader_2D_point_uniform_size_outline_aa_vert_glsl,
.frag = datatoc_gpu_shader_point_uniform_color_outline_aa_frag_glsl,
},
[GPU_SHADER_2D_POINT_UNIFORM_SIZE_VARYING_COLOR_OUTLINE_AA] =
{
+ .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_VARYING_COLOR_OUTLINE_AA",
.vert = datatoc_gpu_shader_2D_point_uniform_size_varying_color_outline_aa_vert_glsl,
.frag = datatoc_gpu_shader_point_varying_color_outline_aa_frag_glsl,
},
[GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR]
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list