Change rs_allocate_debug_closure to take the closure id

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

src/include/OSL/rs_free_function.h

@@ -327,10 +327,11 @@ rs_allocate_closure(OSL::OpaqueExecContextPtr oec, size_t size,
 /// of rs_allocate_closure when the closure being allocated is the OSL
 /// `debug()` closure. Renderers can override this to handle debug closures
 /// differently (e.g., allocate from a separate pool, or return nullptr to
-/// suppress debug closures in production builds). The default fallback
+/// suppress debug closures in production builds). The `id` parameter is the
+/// closure ID as registered by the renderer. The default fallback
 /// implementation simply delegates to rs_allocate_closure.
 OSL_RSOP OSL_HOSTDEVICE void*
-rs_allocate_debug_closure(OSL::OpaqueExecContextPtr oec, size_t size,
+rs_allocate_debug_closure(OSL::OpaqueExecContextPtr oec, int id, size_t size,
                           size_t alignment);
 
 /// Report errors, warnings, printf, and fprintf.

src/liboslexec/opclosure.cpp

@@ -120,7 +120,7 @@ osl_allocate_debug_closure_component(OpaqueExecContextPtr oec, int id, int size)
 {
     const size_t needed = sizeof(ClosureComponent) + size;
     ClosureComponent* comp
-        = (ClosureComponent*)rs_allocate_debug_closure(oec, needed,
+        = (ClosureComponent*)rs_allocate_debug_closure(oec, id, needed,
                                                        alignof(ClosureComponent));
     if (comp) {
         comp->id = id;
@@ -140,7 +140,7 @@ osl_allocate_weighted_debug_closure_component(OpaqueExecContextPtr oec, int id,
         return NULL;
     const size_t needed = sizeof(ClosureComponent) + size;
     ClosureComponent* comp
-        = (ClosureComponent*)rs_allocate_debug_closure(oec, needed,
+        = (ClosureComponent*)rs_allocate_debug_closure(oec, id, needed,
                                                        alignof(ClosureComponent));
     if (comp) {
         comp->id = id;

src/liboslexec/rs_fallback.cpp

@@ -330,8 +330,8 @@ rs_allocate_closure(OSL::OpaqueExecContextPtr exec_ctx, size_t size,
 }
 
 OSL_RSOP OSL_HOSTDEVICE void*
-rs_allocate_debug_closure(OSL::OpaqueExecContextPtr exec_ctx, size_t size,
-                          size_t alignment)
+rs_allocate_debug_closure(OSL::OpaqueExecContextPtr exec_ctx, int id,
+                          size_t size, size_t alignment)
 {
     return rs_allocate_closure(exec_ctx, size, alignment);
 }

src/testshade/rs_simplerend.cpp

@@ -392,7 +392,7 @@ rs_allocate_closure(OSL::OpaqueExecContextPtr ec, size_t size, size_t alignment)
 }
 
 OSL_RSOP OSL_HOSTDEVICE void*
-rs_allocate_debug_closure(OSL::OpaqueExecContextPtr ec, size_t size,
+rs_allocate_debug_closure(OSL::OpaqueExecContextPtr ec, int id, size_t size,
                           size_t alignment)
 {
     return rs_allocate_closure(ec, size, alignment);