diff --git a/src/gpu/gpu_dx12.c b/src/gpu/gpu_dx12.c index fa5bab08..0e6b8fdd 100644 --- a/src/gpu/gpu_dx12.c +++ b/src/gpu/gpu_dx12.c @@ -326,7 +326,6 @@ void GPU_D12_InitObjects(void) Counter counter = ZI; RunJob(DX12_NUM_QUEUES, GPU_D12_AcquireCommandQueueJob, JobPool_Inherit, JobPriority_Low, &counter, .descs_in = params, .cqs_out = g->command_queues); WaitOnCounter(&counter); - DEBUGBREAKABLE; } #if ProfilingIsEnabled { diff --git a/src/prof/prof_tracy.h b/src/prof/prof_tracy.h index a0c115ba..248ba608 100644 --- a/src/prof/prof_tracy.h +++ b/src/prof/prof_tracy.h @@ -41,7 +41,7 @@ inline void __prof_zone_cleanup_func(TracyCZoneCtx *ctx) { TracyCZoneEnd(*ctx) } #define __prof __profnc(0, 0) #define __profvalue(v) TracyCZoneValue(__tracy_zone_ctx, (v)) -#define __profalloc(ptr, size) TracyCAcquire((ptr), (size)) +#define __profalloc(ptr, size) TracyCAlloc((ptr), (size)) #define __proffree(ptr) TracyCFree((ptr)) #define __profmsg(txt, len, col) TracyCMessageC((txt), (len), Bgr32(col)) #define __profframe(name) TracyCFrameMarkNamed((name)) diff --git a/src/sprite/sprite_core.c b/src/sprite/sprite_core.c index 110c5897..4cc8fefa 100644 --- a/src/sprite/sprite_core.c +++ b/src/sprite/sprite_core.c @@ -685,6 +685,7 @@ S_ScopeCacheEntryRef *S_EnsureRefUnsafely(S_Scope *scope, S_CacheEntry *e) S_ScopeCacheEntryRef *S_EnsureRefFromEntryLocked(S_Scope *scope, S_CacheEntry *e, Lock *bin_lock) { S_SharedState *g = &S_shared_state; + LAX g; /* Guaranteed safe if caller has lock on entry's bin, since entry may not have an existing reference and could otherwise be evicted while ensuring this reference */ AssertLockedES(bin_lock, &g->cache.bins[e->hash.v % S_CacheBinsCount].mutex); return S_EnsureRefUnsafely(scope, e);