Use stack closure pool for test shade cpu bitcode

Signed-off-by: Curtis Black <curtis.w.black@gmail.com>

Author: curtisblack

src/liboslexec/shadeimage.cpp

@@ -116,9 +116,6 @@ shade_image(ShadingSystem& shadingsys, ShaderGroup& group,
             // That also implies that our normal points to (0,0,1)
             sg.N  = Vec3(0, 0, 1);
             sg.Ng = Vec3(0, 0, 1);
-            // In our SimpleRenderer, the "renderstate" itself just a pointer to
-            // the ShaderGlobals.
-            // sg.renderstate = &sg;
         }
 
         // Loop over all pixels in the image (in x and y)...

src/osltoy/osltoyrenderer.cpp

@@ -115,9 +115,6 @@ OSLToyRenderer::OSLToyRenderer()
     // That also implies that our normal points to (0,0,1)
     sg.N  = Vec3(0, 0, 1);
     sg.Ng = Vec3(0, 0, 1);
-    // In our SimpleRenderer, the "renderstate" itself just a pointer to
-    // the ShaderGlobals.
-    // sg.renderstate = &sg;
 }
 
 

src/testrender/simpleraytracer.cpp

@@ -921,12 +921,6 @@ SimpleRaytracer::globals_from_hit(ShaderGlobalsType& sg, const Ray& r,
     }
     sg.raytype        = r.raytype;
     sg.flipHandedness = sg.dPdx.cross(sg.dPdy).dot(sg.N) < 0;
-
-#ifndef __CUDACC__
-    // In our SimpleRaytracer, the "renderstate" itself just a pointer to
-    // the ShaderGlobals.
-    sg.renderstate = &sg;
-#endif
 }
 
 
@@ -1349,7 +1343,6 @@ SimpleRaytracer::prepare_geometry()
                 sg.v             = uv[i].y;
                 sg.I             = (p[i] - camera.eye).normalize();
                 sg.surfacearea   = area;
-                sg.renderstate   = &sg;
 
                 shadingsys->execute(*ctx, *m_shaders[shaderID].disp, sg);
 

src/testshade/rs_simplerend.cpp

@@ -368,14 +368,12 @@ rs_trace_get(OSL::OpaqueExecContextPtr ec, OSL::ustringhash name,
 #endif
 }
 
-#ifdef __CUDA_ARCH__  // Host side uses rs_fallback implementation.
 OSL_RSOP OSL_HOSTDEVICE void*
 rs_allocate_closure(OSL::OpaqueExecContextPtr ec, size_t size, size_t alignment)
 {
     auto rs = OSL::get_rs<RenderState>(ec);
     return rs->closure_pool->allocate(size, alignment);
 }
-#endif
 
 OSL_RSOP OSL_HOSTDEVICE bool
 rs_get_attribute_constant_string(OSL::ustringhash value, void* result)

src/testshade/testshade.cpp

@@ -952,16 +952,19 @@ static RenderContext theRenderContext;
 // Set up the ShaderGlobals fields for pixel (x,y).
 static void
 setup_shaderglobals(ShaderGlobals& sg, ShadingSystem* shadingsys,
-                    RenderState& renderState, int x, int y)
+                    RenderState& renderState, StackClosurePool* closure_pool,
+                    int x, int y)
 {
     // Just zero the whole thing out to start
     memset((char*)&sg, 0, sizeof(ShaderGlobals));
 
     // Any state data needed by SimpleRenderer or its free function equivalent
     // will need to be passed here the ShaderGlobals.
     renderState.context      = &theRenderContext;
-    renderState.closure_pool = nullptr;  // Use inbuilt closure pool.
+    renderState.closure_pool = closure_pool;
     sg.renderstate           = &renderState;
+    if (closure_pool)
+        closure_pool->reset();
 
     // Set "shader" space to be Mshad.  In a real renderer, this may be
     // different for each shader group.
@@ -1185,7 +1188,8 @@ setup_output_images(SimpleRenderer* rend, ShadingSystem* shadingsys,
         raytype_bit = shadingsys->raytype_bit(ustring(raytype_name));
         ShaderGlobals sg;
         RenderState renderState;
-        setup_shaderglobals(sg, shadingsys, renderState, 0, 0);
+        StackClosurePool closure_pool;
+        setup_shaderglobals(sg, shadingsys, renderState, &closure_pool, 0, 0);
 
 #if OSL_USE_BATCHED
         if (batched) {
@@ -1590,6 +1594,7 @@ shade_region(SimpleRenderer* rend, ShaderGroup* shadergroup, OIIO::ROI roi,
     // Set up shader globals and a little test grid of points to shade.
     ShaderGlobals shaderglobals;
     RenderState renderState;
+    StackClosurePool closure_pool;
 
     raytype_bit = shadingsys->raytype_bit(ustring(raytype_name));
 
@@ -1610,7 +1615,8 @@ shade_region(SimpleRenderer* rend, ShaderGroup* shadergroup, OIIO::ROI roi,
             // set it up rigged to look like we're rendering a single
             // quadrilateral that exactly fills the viewport, and that
             // setup is done in the following function call:
-            setup_shaderglobals(shaderglobals, shadingsys, renderState, x, y);
+            setup_shaderglobals(shaderglobals, shadingsys, renderState,
+                                &closure_pool, x, y);
 
             if (this_threads_index == uninitialized_thread_index) {
                 this_threads_index = next_thread_index.fetch_add(1u);