Page MenuHome
Differential D13910

Workbench: Port shaders to use GPUShaderCreateInfo
ClosedPublic
Actions

Authored by Clément Foucault (fclem) on Jan 24 2022, 1:36 PM.

Details

Reviewers
Jeroen Bakker (jbakker)
Commits
rB5b299e5999e2: D13910: Workbench: Port shaders to use GPUShaderCreateInfo
Summary

Also adds a few things to GPUShader for easily create shaders.
Heavy usage of macros to compose the createInfo and avoid
duplications and copy paste bugs.
This makes the link between the shader request functions
(in workbench_shader.cc) and the actual createInfo a bit
obscure since the names are composed and not searchable.

Diff Detail

Repository
rB Blender

Event Timeline

Clément Foucault (fclem) requested review of this revision.Jan 24 2022, 1:36 PM
Clément Foucault (fclem) created this revision.
Harbormaster completed remote builds in B20127: Diff 47374.Jan 24 2022, 1:36 PM
Jeroen Bakker (jbakker) added a comment.Jan 24 2022, 2:01 PM

Did a first pass. Some minor changes.
Will test drive it on Mac before approving.

source/blender/draw/engines/workbench/workbench_shader.cc
32

Could these be cleaned up?

source/blender/draw/intern/shaders/draw_view_info.hh
94

Not related to this change, would expected it to be Type::MAT4

source/blender/gpu/intern/gpu_shader.cc
252 ↗(On Diff #47374)

Should also be used in gpu_shaders_builtin.

Clément Foucault (fclem) updated this revision to Diff 47376.Jan 24 2022, 3:02 PM
  • Fix image tansparency cutoff
Harbormaster completed remote builds in B20129: Diff 47376.Jan 24 2022, 3:02 PM
Clément Foucault (fclem) updated this revision to Diff 47377.Jan 24 2022, 3:37 PM
  • Fix legacy modelmat path
Harbormaster completed remote builds in B20130: Diff 47377.Jan 24 2022, 3:37 PM
Clément Foucault (fclem) updated this revision to Diff 47394.Jan 24 2022, 9:28 PM
  • Fix legacy modelmat path patch
  • Cleanup: Share definition of world data UBO
  • Merge branch 'master' into tmp-workbench-shader-create-infos
Harbormaster completed remote builds in B20139: Diff 47394.Jan 24 2022, 9:28 PM
Jeroen Bakker (jbakker) requested changes to this revision.Jan 25 2022, 11:35 AM

In the legacy part the single color and random colors aren't working.
This is how the draw instance emulation is implemented in the draw manager. This should be moved to the GPU module, but might be a task on its own.

This revision now requires changes to proceed.Jan 25 2022, 11:35 AM
Jeroen Bakker (jbakker) added a child revision: D13915: Draw: Migrate hair refine compute shader to use create info..Jan 25 2022, 2:03 PM
Jeroen Bakker (jbakker) removed a child revision: D13915: Draw: Migrate hair refine compute shader to use create info..Jan 25 2022, 2:33 PM
Clément Foucault (fclem) updated this revision to Diff 47452.Jan 25 2022, 6:58 PM
  • Port more of the draw glue layer to GPUShaderCreateInfo
  • Merge branch 'master' into tmp-workbench-shader-create-infos
  • Merge branch 'master' into tmp-workbench-shader-create-infos
Harbormaster completed remote builds in B20173: Diff 47452.Jan 25 2022, 6:59 PM
Clément Foucault (fclem) updated this revision to Diff 47464.Jan 26 2022, 10:22 AM
  • Merge branch 'master' into tmp-workbench-shader-create-infos
Harbormaster completed remote builds in B20178: Diff 47464.Jan 26 2022, 10:22 AM
Jeroen Bakker (jbakker) accepted this revision.Jan 26 2022, 10:34 AM

Just checked on M1 and issues have been addressed.

This revision is now accepted and ready to land.Jan 26 2022, 10:34 AM
Clément Foucault (fclem) updated this revision to Diff 47467.Jan 26 2022, 12:40 PM
  • Merge branch 'master' into tmp-workbench-shader-create-infos
Harbormaster completed remote builds in B20179: Diff 47467.Jan 26 2022, 12:40 PM
Closed by commit rB5b299e5999e2: D13910: Workbench: Port shaders to use GPUShaderCreateInfo (authored by Clément Foucault (fclem)). · Explain WhyJan 26 2022, 12:47 PM
This revision was automatically updated to reflect the committed changes.
Clément Foucault (fclem) added a commit: rB5b299e5999e2: D13910: Workbench: Port shaders to use GPUShaderCreateInfo.

Revision Contents
Changeset List

PathSize
source/
blender/
draw/
5 lines
engines/
workbench/
shaders/
infos/
41 lines
64 lines
55 lines
11 lines
9 lines
98 lines
10 lines
114 lines
infos/
5 lines
93 lines
8 lines
11 lines
2 lines
12 lines
31 lines
8 lines
39 lines
4 lines
5 lines
9 lines
12 lines
10 lines
6 lines
11 lines
20 lines
15 lines
22 lines
45 lines
6 lines
32 lines
14 lines
15 lines
7 lines
32 lines
14 lines
8 lines
2 lines
2 lines
2 lines
2 lines
5 lines
14 lines
1 line
444 lines
1 line
14 lines
8 lines
intern/
11 lines
15 lines
shaders/
2 lines
6 lines
33 lines
120 lines
1 line
85 lines
tests/
2 lines
gpu/
12 lines
5 lines
intern/
10 lines
36 lines
9 lines
opengl/
6 lines

Diff 47469

View Options

source/blender/draw/CMakeLists.txt

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_effect_cavity_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_merge_infront_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_curvature_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_effect_cavity_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_effect_cavity_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_effect_outline_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_vert.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_effect_taa_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_image_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_matcap_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_material_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_prepass_info.hh

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_prepass_pointcloud_vert.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_shader_interface_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_geom.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_shadow_debug_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_shadow_geom.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_transparent_accum_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_transparent_resolve_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl

Loading...
View Options

source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl

Loading...
View Options

source/blender/draw/engines/workbench/workbench_effect_cavity.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_effect_dof.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_effect_outline.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_engine.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_materials.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_opaque.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_private.h

Loading...
View Options

source/blender/draw/engines/workbench/workbench_shader.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_shader.cc

Loading...
View Options

source/blender/draw/engines/workbench/workbench_shader_shared.h

Loading...
View Options

source/blender/draw/engines/workbench/workbench_transparent.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_volume.c

Loading...
View Options

source/blender/draw/intern/draw_manager_data.c

Loading...
View Options

source/blender/draw/intern/draw_shader_shared.h

Loading...
View Options

source/blender/draw/intern/shaders/common_hair_lib.glsl

Loading...
View Options

source/blender/draw/intern/shaders/common_smaa_lib.glsl

Loading...
View Options

source/blender/draw/intern/shaders/common_view_clipping_lib.glsl

Loading...
View Options

source/blender/draw/intern/shaders/common_view_lib.glsl

Loading...
View Options

source/blender/draw/intern/shaders/draw_object_infos_info.hh

Loading...
View Options

source/blender/draw/intern/shaders/draw_view_info.hh

Loading...
View Options

source/blender/draw/tests/shaders_test.cc

Loading...
View Options

source/blender/gpu/CMakeLists.txt

Loading...
View Options

source/blender/gpu/GPU_shader.h

Loading...
View Options

source/blender/gpu/intern/gpu_shader_create_info.hh

Loading...
View Options

source/blender/gpu/intern/gpu_shader_create_info.cc

Loading...
View Options

source/blender/gpu/intern/gpu_shader_interface.hh

Loading...
View Options

source/blender/gpu/opengl/gl_shader.cc

Loading...