CMake: revert last weeks modernizations #110438

Ray molenkamp · 2023-07-25T01:16:17+02:00

Ray molenkamp commented

2023-07-25 01:16:17 +02:00

The cleanup of blenkernel last week, caused the house of cards to
collapse on top of bf_gpu's shader_builder, which is off by default
but used on a daily basis by the rendering team.

Given the fixes forward in #110394 ran into a ODR violation in OSL that
was hiding there for years, I don't see another way forward without
impeding the rendering teams productivity for "quite a while" as there
is no guarantee the OSL issue would be the end of it.

the only way forward appears to be back.

this reverts :

19422044ed
a670b53abe
0f541db97c
be516e8c81
3e88a2f44c
4e64b772f5
9547e7a317
07fe6c5a57

The problematic commit was 07fe6c5a57
as blenkernel links most of blender, it's a bit of a link order issue
magnet. Given all these commits stack, it's near impossible to revert
just that one without spending a significant amount of time resolving
merge conflicts. 99% of that work was automated, so easier to just
revert all of them, and re-do the work, than it is to deal with the
merge conflicts.

The cleanup of blenkernel last week, caused the house of cards to collapse on top of bf_gpu's shader_builder, which is off by default but used on a daily basis by the rendering team. Given the fixes forward in #110394 ran into a ODR violation in OSL that was hiding there for years, I don't see another way forward without impeding the rendering teams productivity for "quite a while" as there is no guarantee the OSL issue would be the end of it. the only way forward appears to be back. this reverts : 19422044edbd8e8d524db3d02768c4a52f5274be a670b53abe82f7a36d2caa0d8ae2c67c2bc8c39a 0f541db97c47e5fcd1c71160d71642235d9ea743 be516e8c814dbf7bc43ea91c6913be9f7f96e006 3e88a2f44c413fa7f671f638409a975d59f8c1fb 4e64b772f5ed8f352c2744baece802f70e2430e7 9547e7a317d6f86ab8fbfb3d440f127c2ab75df2 07fe6c5a57d7bcf89318204c0319db1f4a2f5cbd The problematic commit was 07fe6c5a57d7bcf89318204c0319db1f4a2f5cbd as blenkernel links most of blender, it's a bit of a link order issue magnet. Given all these commits stack, it's near impossible to revert just that one without spending a significant amount of time resolving merge conflicts. 99% of that work was automated, so easier to just revert all of them, and re-do the work, than it is to deal with the merge conflicts.

Ray molenkamp added 2 commits 2023-07-25 01:16:34 +02:00

CMake: revert last weeks modernizations 532b875a62

Something in last weeks work, caused the house of cards to
collapse on top of bf_gpu's shader_builder, which is off
by default but used on a daily basis by the rendering
team.

Given the fixes forward in #110394 ran into a ODR violation
in OSL that was hiding for years, I don't see another way
forward without impeding the rendering teams productivity
for "quite a while"

the only way forward appears to be back.

this reverts :

19422044ed
a670b53abe
0f541db97c
be516e8c81
3e88a2f44c
4e64b772f5
9547e7a317
07fe6c5a57

99% of that work was automated, so while it was
a lot of work, most of it was waiting for builds
to finish.

a better testing mechanism will need to be setup
for testing these build system changes.