Fix: shader_builder build #110394

Ray molenkamp · 2023-07-23T07:25:21+02:00

Ray molenkamp commented

2023-07-23 07:25:21 +02:00

somewhat of an oddball, shader_builder is off by default, but clement
mentioned i broke it, so I went out to fix it (It's on by default now
for me locally while testing any build system changes)

Shader_builder should be a fairly light executable that checks if
shaders compile but, since it depends on bf_gpu, which drags in
blenkernel, which drags in all of blender, it's a bit chunkier than one
would hope it would be.

Either way, one of the cleanups in the last week gave it some build
issues which are easily resolved by adding the missing dependency on
bf_bmesh, and once that's fixed, it gave some linker errors, caused by
link order issues due to missing dependencies inside cycles.

cycles_util needs to link glog, since log.cpp uses it
cycles_scene need to link cycles_graph since shader.cpp uses the node
api

These changes make it work for now, but I'm fairly confident this wasn't
the last of the link order issues.

somewhat of an oddball, shader_builder is off by default, but clement mentioned i broke it, so I went out to fix it (It's on by default now for me locally while testing any build system changes) Shader_builder should be a fairly light executable that checks if shaders compile but, since it depends on bf_gpu, which drags in blenkernel, which drags in all of blender, it's a bit chunkier than one would hope it would be. Either way, one of the cleanups in the last week gave it some build issues which are easily resolved by adding the missing dependency on bf_bmesh, and once that's fixed, it gave some linker errors, caused by link order issues due to missing dependencies inside cycles. - cycles_util needs to link glog, since log.cpp uses it - cycles_scene need to link cycles_graph since shader.cpp uses the node api These changes make it work for now, but I'm fairly confident this wasn't the last of the link order issues.

Ray molenkamp added 1 commit 2023-07-23 07:25:37 +02:00

buildbot/vexp-code-patch-coordinator Build done. Details

3278f852c9 Fix: shader_builder build

somewhat of an oddball, shader_builder is off by default, but clement
mentioned i broke it, so I went out to fix it (It's on by default now
for me locally while testing any build system changes)

Shader_builder should be a fairly light executable that checks if
shaders compile but, since it depends on bf_gpu, which drags in
blenkernel, which drags in all of blender, it's a bit chunkier than one
would hope it would be.

Either way, one of the cleanups in the last week gave it some build
issues which are easily resolved by adding the missing dependency on
bf_bmesh, and once that's fixed, it gave some linker errors, caused by
link order issues due to missing dependencies inside cycles.

- cycles_util needs to link glog, since log.cpp uses it
- cycles_scene need to link cycles_graph since shader.cpp uses the node
api

These changes make it work for now, but I'm fairly confident this wasn't
the last of the link order issues.

Ray molenkamp requested review from Brecht Van Lommel 2023-07-23 07:25:49 +02:00

Ray molenkamp commented

2023-07-23 07:28:19 +02:00

@brecht more of an fyi to keep you in the loop than a review request, you want to get these in the future when i make minor tweaks to cycles like these? or can i just go ahead with them?

Ray molenkamp commented

2023-07-23 16:39:13 +02:00

@blender-bot build

Ray molenkamp commented

2023-07-23 18:00:09 +02:00

@brecht that ODR violation inside OSL on mac, appears to be real, OSL is including the flex/bison generated code in both oslcomp and oslexec which is bad thing.

https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/blob/main/src/liboslexec/CMakeLists.txt#L151

taking out that line seems ok on windows (be sure to remove the build folder so a stale copy of the generated files doesn't hang around) since i don't have a mac , i can't really test you mind taking a closer look here?

@brecht that ODR violation inside OSL on mac, appears to be real, OSL is including the flex/bison generated code in both oslcomp and oslexec which is bad thing. https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/blob/main/src/liboslexec/CMakeLists.txt#L151 taking out that line seems ok on windows (be sure to remove the build folder so a stale copy of the generated files doesn't hang around) since i don't have a mac , i can't really test you mind taking a closer look here?

Ray molenkamp referenced this pull request

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

CMake: revert last weeks modernizations #110438

Ray molenkamp commented

2023-07-25 01:18:52 +02:00

Given there's no guarantee fixing OSL will be the final battle here, i'm opting to revert last weeks work, paying whack a mole with the buildsystem isn't a sustainable way forward with other teams depending on certain tools be building reliably.

revert in #110438

Given there's no guarantee fixing OSL will be the final battle here, i'm opting to revert last weeks work, paying whack a mole with the buildsystem isn't a sustainable way forward with other teams depending on certain tools be building reliably. revert in #110438

Ray molenkamp closed this pull request

2023-07-25 01:18:54 +02:00

Ray molenkamp referenced this issue from a commit

2023-07-25 16:43:29 +02:00

CMake: revert last weeks modernizations

Brecht Van Lommel referenced this pull request

2023-08-09 18:58:00 +02:00

Build: patch OSL to avoid duplicate symbols in static libraries #110974

Brecht Van Lommel referenced this pull request

2023-08-09 19:52:04 +02:00

Build: patch OSL to avoid duplicate symbols in static libraries #110974

Brecht Van Lommel commented

2023-08-09 19:52:36 +02:00

Sorry for the delay. I've now updated the macOS OSL libraries to solve the problem.

Brecht Van Lommel referenced this issue from a commit

2023-08-09 19:53:17 +02:00

Build: patch OSL to avoid duplicate symbols in static libraries

Clément Foucault commented

2023-08-10 10:54:43 +02:00

So is this patch going to be revived or not? main isn't broken at the moment but would be cool to have the cmake improvements back.

So is this patch going to be revived or not? `main` isn't broken at the moment but would be cool to have the cmake improvements back.

Ray molenkamp commented

2023-08-10 18:08:55 +02:00

Eventually all of that will make it back in, that work was done when i had lots of time to spare, currently much less so, if there's specific projects you'd like to be done, you can always hit me up on chat though, if it's doable i'll make it work. but the days I did multiple a day won't be happening for a bit. Also given blenkernel turned out a bit of an unstable beast, i'll likely make my way from the smaller libs to the bigger ones (ie don' task for blenkernel)

buildbot/vexp-code-patch-coordinator Build done.

Details

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix: shader_builder build #110394

Pull request closed