diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-09-24 00:27:33 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-09-24 00:27:42 +0300 |
commit | 1b5c94630eb78c3a8f8249245dc7e70e23d644b0 (patch) | |
tree | c6c4314edc6bba6c22a467f63a465bf3153fa4b7 /source/blender | |
parent | fd2668a368db1257a16840af03c28e78c0063225 (diff) |
GPU: Disable static compilation for geometry shaders workaround
These shaders are only supported by the Metal backed.
Regression introduced by 1514e1a5b7e15ec0c11cd40c2b9389982bd5d00e
Diffstat (limited to 'source/blender')
4 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh index 0ab653ba29f..caa18ece122 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh @@ -90,7 +90,7 @@ GPU_SHADER_CREATE_INFO(overlay_armature_shape_outline) .additional_info("overlay_frag_output", "overlay_armature_common", "draw_globals"); GPU_SHADER_CREATE_INFO(overlay_armature_shape_outline_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .vertex_in(0, Type::VEC3, "pos") .vertex_in(1, Type::VEC3, "snor") /* Per instance. */ @@ -106,7 +106,7 @@ GPU_SHADER_CREATE_INFO(overlay_armature_shape_outline_clipped) .additional_info("overlay_armature_shape_outline", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_armature_shape_outline_clipped_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .additional_info("overlay_armature_shape_outline_no_geom", "drw_clipped"); GPU_SHADER_INTERFACE_INFO(overlay_armature_shape_solid_iface, "") diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh index e2cc0a54153..8c9c943393f 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh @@ -74,7 +74,7 @@ GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge) /* The Non-Geometry shader variant passes directly to fragment. */ GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .define("EDGE") .vertex_in(0, Type::VEC3, "pos") .vertex_in(1, Type::UCHAR4, "data") @@ -90,7 +90,7 @@ GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_flat) .additional_info("overlay_edit_mesh_edge"); GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_flat_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .define("FLAT") .additional_info("overlay_edit_mesh_edge_no_geom"); @@ -165,7 +165,7 @@ GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_clipped) .additional_info("overlay_edit_mesh_edge", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_clipped_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .additional_info("overlay_edit_mesh_edge_no_geom", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_flat_clipped) @@ -173,7 +173,7 @@ GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_flat_clipped) .additional_info("overlay_edit_mesh_edge_flat", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_edit_mesh_edge_flat_clipped_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .additional_info("overlay_edit_mesh_edge_flat_no_geom", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_edit_mesh_face_clipped) @@ -363,7 +363,7 @@ GPU_SHADER_CREATE_INFO(overlay_edit_curve_handle) .additional_info("draw_mesh", "draw_globals"); GPU_SHADER_CREATE_INFO(overlay_edit_curve_handle_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .typedef_source("overlay_shader_shared.h") /* NOTE: Color already in Linear space. Which is what we want. */ .define("srgbTarget", "false") @@ -382,7 +382,7 @@ GPU_SHADER_CREATE_INFO(overlay_edit_curve_handle_clipped) .additional_info("overlay_edit_curve_handle", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_edit_curve_handle_clipped_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .additional_info("overlay_edit_curve_handle_no_geom", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_edit_curve_point) diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh index 65084361f14..690d12b7020 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh @@ -203,7 +203,7 @@ GPU_SHADER_CREATE_INFO(overlay_motion_path_line) .additional_info("draw_view", "draw_globals"); GPU_SHADER_CREATE_INFO(overlay_motion_path_line_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .vertex_in(0, Type::VEC3, "pos") .push_constant(Type::IVEC4, "mpathLineSettings") .push_constant(Type::BOOL, "selected") @@ -220,7 +220,7 @@ GPU_SHADER_CREATE_INFO(overlay_motion_path_line_clipped) .additional_info("overlay_motion_path_line", "drw_clipped"); GPU_SHADER_CREATE_INFO(overlay_motion_path_line_clipped_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .additional_info("overlay_motion_path_line_no_geom", "drw_clipped"); GPU_SHADER_INTERFACE_INFO(overlay_motion_path_point_iface, "").flat(Type::VEC4, "finalColor"); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh index f16dc516bac..23f6790abfc 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh @@ -49,7 +49,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color) .additional_info("gpu_shader_3D_polyline"); GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .define("UNIFORM") .push_constant(Type::VEC4, "color") .additional_info("gpu_shader_3D_polyline_no_geom"); @@ -63,7 +63,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_clipped) .additional_info("gpu_shader_3D_polyline_uniform_color"); GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_clipped_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ /* TODO(fclem): Put in an UBO to fit the 128byte requirement. */ .push_constant(Type::MAT4, "ModelMatrix") .push_constant(Type::VEC4, "ClipPlane") @@ -77,7 +77,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_flat_color) .additional_info("gpu_shader_3D_polyline"); GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_flat_color_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .define("FLAT") .vertex_in(1, Type::VEC4, "color") .additional_info("gpu_shader_3D_polyline_no_geom"); @@ -89,7 +89,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_smooth_color) .additional_info("gpu_shader_3D_polyline"); GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_smooth_color_no_geom) - .do_static_compilation(true) + // .do_static_compilation(true) /* TODO fix on GL */ .define("SMOOTH") .vertex_in(1, Type::VEC4, "color") .additional_info("gpu_shader_3D_polyline_no_geom"); |