From 8409f81f9f9619cb0a769427fff86ce82b2ac72a Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 26 Sep 2025 12:38:47 +0200 Subject: [PATCH] Workbench: Use strip curve rendering during rendertests This PR enables strip curve drawing when performing the workbench rendertests. On Intel/vulkan the lines are to far off. Using strip will reduce platform differences. Downside is that (basic) line rendering is not covered anymore by a render test. Pull Request: https://projects.blender.org/blender/blender/pulls/146820 --- .../render/hair/workbench_renders/hair_basemesh_intercept.png | 4 ++-- .../files/render/hair/workbench_renders/hair_instancer_uv.png | 4 ++-- .../render/hair/workbench_renders/hair_particle_random.png | 4 ++-- tests/files/render/hair/workbench_renders/hair_reflection.png | 4 ++-- .../files/render/hair/workbench_renders/hair_transmission.png | 4 ++-- .../hair/workbench_renders/microfacet_hair_orientation.png | 4 ++-- .../principled_hair_absorptioncoefficient.png | 4 ++-- .../hair/workbench_renders/principled_hair_directcoloring.png | 4 ++-- .../principled_hair_melaninconcentration.png | 4 ++-- .../render/hair/workbench_renders/transparent_shadow_hair.png | 4 ++-- .../hair/workbench_renders/transparent_shadow_hair_blur.png | 4 ++-- .../render/mesh/workbench_renders/visibility_particles.png | 4 ++-- .../workbench_renders/bvh_steps_curve_segments_0.png | 4 ++-- .../workbench_renders/bvh_steps_curve_segments_3.png | 4 ++-- .../workbench_renders/bvh_steps_line_segments_0.png | 4 ++-- .../workbench_renders/bvh_steps_line_segments_3.png | 4 ++-- .../motion_blur/workbench_renders/curve_motion_blur.png | 4 ++-- .../render/render_layer/workbench_renders/rlayer_flags_01.png | 4 ++-- .../render/render_layer/workbench_renders/rlayer_flags_02.png | 4 ++-- .../render/render_layer/workbench_renders/rlayer_flags_03.png | 4 ++-- .../render/render_layer/workbench_renders/rlayer_flags_04.png | 4 ++-- tests/files/render/sss/workbench_renders/sss_hair.png | 4 ++-- tests/python/workbench_render_tests.py | 3 +++ 23 files changed, 47 insertions(+), 44 deletions(-) diff --git a/tests/files/render/hair/workbench_renders/hair_basemesh_intercept.png b/tests/files/render/hair/workbench_renders/hair_basemesh_intercept.png index dce62f7d07f..7ded080b5ea 100644 --- a/tests/files/render/hair/workbench_renders/hair_basemesh_intercept.png +++ b/tests/files/render/hair/workbench_renders/hair_basemesh_intercept.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b016d0b31db6acb2df361973195adb5166a8eb0c1fdc60e3e49ba05539c78b5a -size 9245 +oid sha256:696394816c88c348bbe5585730f628cf1ae6095696bfa62b6c44fff007d51bbd +size 10015 diff --git a/tests/files/render/hair/workbench_renders/hair_instancer_uv.png b/tests/files/render/hair/workbench_renders/hair_instancer_uv.png index 3b0e89e5c3f..bb1d572be73 100644 --- a/tests/files/render/hair/workbench_renders/hair_instancer_uv.png +++ b/tests/files/render/hair/workbench_renders/hair_instancer_uv.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:521d70f5fc737f7a5473f72d34c22ccc23f98f429a9caa0eb881f9c5d70b8b45 -size 21879 +oid sha256:9deac5b72635f56bb6bb4078924d29d93f9eeaa74fa3172a37067fca520e9df3 +size 21312 diff --git a/tests/files/render/hair/workbench_renders/hair_particle_random.png b/tests/files/render/hair/workbench_renders/hair_particle_random.png index 493892110f4..152e79d6cc0 100644 --- a/tests/files/render/hair/workbench_renders/hair_particle_random.png +++ b/tests/files/render/hair/workbench_renders/hair_particle_random.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22c603c2bf180ddad3b37d4cfe30f67bbdcef91aa578531c6a438674aaa4d0b1 -size 17380 +oid sha256:e1feae7e2cf6a7d245c64643c9c1f84912670cb0e5ab1604ec54a948aaa3d7ba +size 17625 diff --git a/tests/files/render/hair/workbench_renders/hair_reflection.png b/tests/files/render/hair/workbench_renders/hair_reflection.png index 17cae531d35..5ada7805969 100644 --- a/tests/files/render/hair/workbench_renders/hair_reflection.png +++ b/tests/files/render/hair/workbench_renders/hair_reflection.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3645ff5b5a36991b9f42ab6a12c56a3966503cf469a9203ea9b098a1a0e9c8d -size 4356 +oid sha256:d8326dae5e83874823ecb8f43a31278aba1ae07e3cf4a91d2e0800ea56f2b4ea +size 4496 diff --git a/tests/files/render/hair/workbench_renders/hair_transmission.png b/tests/files/render/hair/workbench_renders/hair_transmission.png index 59bf4e6d9be..ada89ba4db2 100644 --- a/tests/files/render/hair/workbench_renders/hair_transmission.png +++ b/tests/files/render/hair/workbench_renders/hair_transmission.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c42b3531ab9d1dbfbde31fc9362e5868047edc0f7fcb66784e0e7a192d16b515 -size 4358 +oid sha256:bcac2c8b86f5f97dee6a46dac2a1eae086033b438427d3b6d22a30f9faee4c8f +size 4498 diff --git a/tests/files/render/hair/workbench_renders/microfacet_hair_orientation.png b/tests/files/render/hair/workbench_renders/microfacet_hair_orientation.png index a3e791c8f8f..5b643a53485 100644 --- a/tests/files/render/hair/workbench_renders/microfacet_hair_orientation.png +++ b/tests/files/render/hair/workbench_renders/microfacet_hair_orientation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:329c5dd33108cdb6b3297ae347dce4cd28b2fb63f8ddd66fd813fcabfe7315fc -size 15031 +oid sha256:b6a93ed5b1c4da05c59938b02fa6b77a4e7e7473cccd4851d5f8864d27864efa +size 16914 diff --git a/tests/files/render/hair/workbench_renders/principled_hair_absorptioncoefficient.png b/tests/files/render/hair/workbench_renders/principled_hair_absorptioncoefficient.png index b6da6e622fb..54c6a40eb8d 100644 --- a/tests/files/render/hair/workbench_renders/principled_hair_absorptioncoefficient.png +++ b/tests/files/render/hair/workbench_renders/principled_hair_absorptioncoefficient.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:885ccfb73f077c9ba6afe77da6bc4cd2e4fe7ff4ef53c51d285745362e8ef6fe -size 6106 +oid sha256:eb5ceb4f2e4b2a379d68cf508d9144b9552d2319cbc69de4f441d416fccd8c92 +size 6217 diff --git a/tests/files/render/hair/workbench_renders/principled_hair_directcoloring.png b/tests/files/render/hair/workbench_renders/principled_hair_directcoloring.png index ec62b2017e4..d018436aace 100644 --- a/tests/files/render/hair/workbench_renders/principled_hair_directcoloring.png +++ b/tests/files/render/hair/workbench_renders/principled_hair_directcoloring.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70bbaed2ecb933d5155dfa069bc7047fc3067f8e14e29ed57958e876bf7a8584 -size 6099 +oid sha256:9fe3a4ea0e0a4b02a224567cb1c1b7e9d57ad98b5c88ffcce515486cc4409246 +size 6210 diff --git a/tests/files/render/hair/workbench_renders/principled_hair_melaninconcentration.png b/tests/files/render/hair/workbench_renders/principled_hair_melaninconcentration.png index 86fba56dd8f..244d8bb74f3 100644 --- a/tests/files/render/hair/workbench_renders/principled_hair_melaninconcentration.png +++ b/tests/files/render/hair/workbench_renders/principled_hair_melaninconcentration.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33b568c96971092f6e4dac7de083fa673f9107e280ecad38ef00ba62d308545a -size 6105 +oid sha256:6842955348bc786bab94e7037f10648609e0d8922d965eee689ad0b8015578c2 +size 6216 diff --git a/tests/files/render/hair/workbench_renders/transparent_shadow_hair.png b/tests/files/render/hair/workbench_renders/transparent_shadow_hair.png index 640635cfa83..1524c4da8c8 100644 --- a/tests/files/render/hair/workbench_renders/transparent_shadow_hair.png +++ b/tests/files/render/hair/workbench_renders/transparent_shadow_hair.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d7f3a9f1aa3e98d1bea041912fdc45df745901341ef9f13d0eb6e8e3f2c4b1b -size 17173 +oid sha256:690cc7ccf3af93e1308a195a65582e26f4d60419ceb49d8035cac2f54237d57a +size 17599 diff --git a/tests/files/render/hair/workbench_renders/transparent_shadow_hair_blur.png b/tests/files/render/hair/workbench_renders/transparent_shadow_hair_blur.png index c39c13f5307..b484ba685e5 100644 --- a/tests/files/render/hair/workbench_renders/transparent_shadow_hair_blur.png +++ b/tests/files/render/hair/workbench_renders/transparent_shadow_hair_blur.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a40af5ae7bcad62908e989e9346e9320b2257fef6f019c2facfa23543a84b1 -size 17178 +oid sha256:8a2580cc796cd24b99aeef4eca42d29943a559498ec6d6f25d68faf9f4073b36 +size 17604 diff --git a/tests/files/render/mesh/workbench_renders/visibility_particles.png b/tests/files/render/mesh/workbench_renders/visibility_particles.png index 7c792ab07c9..b34e40a8c00 100644 --- a/tests/files/render/mesh/workbench_renders/visibility_particles.png +++ b/tests/files/render/mesh/workbench_renders/visibility_particles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77db3d6c05140b712c3f5a99c2eb54a324868ff31959d0560601db4e8f60554f -size 11122 +oid sha256:a934723fbc62a5307f802a5765b85fd8c2079dcbf8611eb8eb0962b0db4868a2 +size 10999 diff --git a/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_0.png b/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_0.png index a1fec4050fa..644f076ee9b 100644 --- a/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_0.png +++ b/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fe2926527ea677c3d5f424fdd121f030cac094b4b38fedcf720824a0eca0c5f -size 4431 +oid sha256:b00406e067b1dd148bb285cecd3df6967773e90029dd3af4ffe85b6e887be2cd +size 4799 diff --git a/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_3.png b/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_3.png index ce4b1043d35..daee8419afe 100644 --- a/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_3.png +++ b/tests/files/render/motion_blur/workbench_renders/bvh_steps_curve_segments_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d26140f62cb87d3e88c9f40597252d454cd6a9de4ade1d4cc42b979f6028f4b -size 4431 +oid sha256:6ce98f64f6bc4a97d3a404f0bca53588d1bb2c1d94ea5d42e90bb2f80cb68f8b +size 4799 diff --git a/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_0.png b/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_0.png index a509431bb77..7788388e410 100644 --- a/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_0.png +++ b/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34c549e85c9a5e6ddd17d8d38360b1f2f0aad1cd51c03ca4b50dfa1e9389c46d -size 4430 +oid sha256:ca9d7d2cadb5108a7b396b115b427ab0a0412a6a24932f0399a2f6ccadda5e72 +size 4798 diff --git a/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_3.png b/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_3.png index 5ae044655cb..a920fcf7751 100644 --- a/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_3.png +++ b/tests/files/render/motion_blur/workbench_renders/bvh_steps_line_segments_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e66c79c2097497765f6c8f7cefc563bdd2029e1557c1ed6cd67e07b1a327484 -size 4430 +oid sha256:c976b052eca3c6edbc9c11384fea95241a1e57e03658817ac6b896908c0bb154 +size 4798 diff --git a/tests/files/render/motion_blur/workbench_renders/curve_motion_blur.png b/tests/files/render/motion_blur/workbench_renders/curve_motion_blur.png index 1522447db97..bfcb1a1e4ed 100644 --- a/tests/files/render/motion_blur/workbench_renders/curve_motion_blur.png +++ b/tests/files/render/motion_blur/workbench_renders/curve_motion_blur.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36d3a9b97a3f642b3278322f98773aba357e1ee2dfc68c21ee15c2f17ea81fcd -size 8110 +oid sha256:f5edad2b472f603ba3c4eafe0f953a8d337d276b329760e6c88ecf19e43eac4b +size 10428 diff --git a/tests/files/render/render_layer/workbench_renders/rlayer_flags_01.png b/tests/files/render/render_layer/workbench_renders/rlayer_flags_01.png index 221832aa683..50024bcb6b8 100644 --- a/tests/files/render/render_layer/workbench_renders/rlayer_flags_01.png +++ b/tests/files/render/render_layer/workbench_renders/rlayer_flags_01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df1585ed0e10d46da837a498ec1ef116ccb129409d56d2e6253ed82de36c615c -size 8170 +oid sha256:76a91ecb1aa513beb31bccc2c571060f15c3e8d70be8f65512ee17777791a308 +size 7880 diff --git a/tests/files/render/render_layer/workbench_renders/rlayer_flags_02.png b/tests/files/render/render_layer/workbench_renders/rlayer_flags_02.png index dd46ead0b6d..71da7ca23a8 100644 --- a/tests/files/render/render_layer/workbench_renders/rlayer_flags_02.png +++ b/tests/files/render/render_layer/workbench_renders/rlayer_flags_02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:643150a770717b063c655be087c34b4d882c5b3c36a8e85dd1a6938e106cbb9f -size 8170 +oid sha256:5837175cde3d690db6fbbf5764600780411be972d22e0c7246379c8cfa7429ca +size 7880 diff --git a/tests/files/render/render_layer/workbench_renders/rlayer_flags_03.png b/tests/files/render/render_layer/workbench_renders/rlayer_flags_03.png index f5c18b2cb44..8b880caef08 100644 --- a/tests/files/render/render_layer/workbench_renders/rlayer_flags_03.png +++ b/tests/files/render/render_layer/workbench_renders/rlayer_flags_03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe0625eacc3afaf7221d6588fe3e3fc3f7be2cc01279b1a7a4e1b74e97d0c167 -size 8170 +oid sha256:d8461745738b93d1e304e18a2a1ec475d6d8a63a477152161ba7fc41baf00ccc +size 7880 diff --git a/tests/files/render/render_layer/workbench_renders/rlayer_flags_04.png b/tests/files/render/render_layer/workbench_renders/rlayer_flags_04.png index 0133cf64f72..34b0b1e897e 100644 --- a/tests/files/render/render_layer/workbench_renders/rlayer_flags_04.png +++ b/tests/files/render/render_layer/workbench_renders/rlayer_flags_04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91e9e010670be322bfecae74bdcfbe82962803228d4e5d8f402c6c0efaee6a6e -size 8170 +oid sha256:05d7d8cc2725f1c3cb3644f93cfd597758ead292bad604ef3f6ec4f0f9bdd9a9 +size 7880 diff --git a/tests/files/render/sss/workbench_renders/sss_hair.png b/tests/files/render/sss/workbench_renders/sss_hair.png index 14d2a8c85cb..cab36e831eb 100644 --- a/tests/files/render/sss/workbench_renders/sss_hair.png +++ b/tests/files/render/sss/workbench_renders/sss_hair.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bab87d342c84a7e84ec17cbe4a89126f0448273f6e8f9dbde841dc99fdec31d7 -size 5404 +oid sha256:4847ba62640960c572e2f565b5a8a139417786f3f71edabf724d148a1ce08a7e +size 5011 diff --git a/tests/python/workbench_render_tests.py b/tests/python/workbench_render_tests.py index 84551f50539..9e951a5a597 100644 --- a/tests/python/workbench_render_tests.py +++ b/tests/python/workbench_render_tests.py @@ -41,6 +41,9 @@ def setup(): scene.display.shading.light = 'STUDIO' scene.display.shading.color_type = 'TEXTURE' + # Hair + scene.render.hair_type = 'STRIP' + # When run from inside Blender, render and exit. try: