blender
/
blender
133
425
Fork 607
Code Issues 6.3k Pull Requests 773 Projects 19 Wiki Activity

Fix #120038: Possible fix for macOS buildbot test crash #120432

Open
Jason Fielder wants to merge 1 commits from Jason-Fielder/blender:Fix_120038_PossibleFixForBuildBotCrash into main
pull from: Jason-Fielder/blender:Fix_120038_PossibleFixForBuildBotCrash
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 4 Commits 1 Files Changed 3 +5 -9
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93307db7d6 - Show all commits

2
source/blender/gpu/metal/mtl_command_buffer.mm
View File

@ -20,7 +20,7 @@ using namespace blender::gpu;
namespace blender::gpu {
/* Counter for active command buffers. */
int MTLCommandBufferManager::num_active_cmd_bufs = 0;
std::atomic<int> MTLCommandBufferManager::num_active_cmd_bufs = 0;
/* -------------------------------------------------------------------- */
/** \name MTLCommandBuffer initialization and render coordination.

2
source/blender/gpu/metal/mtl_context.hh
View File

@ -552,7 +552,7 @@ class MTLCommandBufferManager {
public:
/* Counter for active command buffers. */
static int num_active_cmd_bufs;
static std::atomic<int> num_active_cmd_bufs;
private:
/* Associated Context and properties. */

10
source/blender/gpu/metal/mtl_context.mm
View File

@ -38,12 +38,8 @@ using namespace blender;
using namespace blender::gpu;
/* Fire off a single dispatch per encoder. Can make debugging view clearer for texture resources
* associated with each dispatch. */
#if defined(NDEBUG)
Jeroen Bakker commented 2024-04-10 21:50:20 +02:00
Review
Copy Link

IIRC when tests are run on the buildbot it is done on a build where asserts are enabled. In that sense this doesn't make a change in behavior on the buildbot.

@brecht is my recollection correct?

IIRC when tests are run on the buildbot it is done on a build where asserts are enabled. In that sense this doesn't make a change in behavior on the buildbot. @brecht is my recollection correct?
Brecht Van Lommel commented 2024-04-15 12:49:48 +02:00
Review
Copy Link

The only purpose of NDEBUG is to turn asserts off, following the C standard.

It is independent of debug / release build configurations, despite the name.

So, this does affect behavior of builds using asserts.

The only purpose of `NDEBUG` is to turn asserts off, following the C standard. It is independent of debug / release build configurations, despite the name. So, this does affect behavior of builds using asserts.
Michael Parkin-White commented 2024-04-15 14:06:29 +02:00
Review
Copy Link

Thanks Brecht, then I do believe we should still land this patch regardless, as it should not be changing GPU dispatch behavior on this flag.

(The flag is still situationally used to wait and validate execution of GPU work, but this can be considered a valid assertion that everything has executed correctly).

Thanks Brecht, then I do believe we should still land this patch regardless, as it should not be changing GPU dispatch behavior on this flag. (The flag is still situationally used to wait and validate execution of GPU work, but this can be considered a valid assertion that everything has executed correctly).
# define MTL_DEBUG_SINGLE_DISPATCH_PER_ENCODER 0
#else
# define MTL_DEBUG_SINGLE_DISPATCH_PER_ENCODER 1
#endif
* associated with each dispatch. NOTE: This should only be used during active debugging. */
#define MTL_DEBUG_SINGLE_DISPATCH_PER_ENCODER 0
/* Debug option to bind null buffer for missing UBOs.
* Enabled by default. TODO: Ensure all required UBO bindings are present. */
@ -2724,7 +2720,7 @@ void present(MTLRenderPassDescriptor *blit_descriptor,
/* Decrement count */
MTLCommandBufferManager::num_active_cmd_bufs--;
MTL_LOG_INFO("Active command buffers: %d", MTLCommandBufferManager::num_active_cmd_bufs);
MTL_LOG_INFO("Active command buffers: %d", int(MTLCommandBufferManager::num_active_cmd_bufs));
/* Drawable count and latency management. */
MTLContext::max_drawables_in_flight--;