Add Medium testrender reference images.

ThyOwen · ThyOwen · commit 736b4572987b · 2025-11-20T18:17:28.000-08:00
diff --git a/src/testrender/shading.cpp b/src/testrender/shading.cpp
@@ -1553,22 +1553,21 @@ struct HenyeyGreenstein final : public BSDF {
         Vec3 wi = frame.toworld(local_wi);
         float pdf_val = PhaseHG(cos_theta, g);
 
-        Color3 weight = Color3(1.0f);
-        return { wi, weight, pdf_val, 0.0f };
+        return { wi, Color3(1.0f), pdf_val, 0.0f };
     }
 
 };
 
-struct HomogeneousVolume final : public Medium {
+struct HomogeneousMedium final : public Medium {
     MediumParams params;
 
-    OSL_HOSTDEVICE HomogeneousVolume(const MediumParams& params)
+    OSL_HOSTDEVICE HomogeneousMedium(const MediumParams& params)
         : Medium(this), params(params)
     {
     }
 
-    OSL_HOSTDEVICE static HomogeneousVolume* create(void* storage, const MediumParams& params) {
-        HomogeneousVolume* volume = new (storage) HomogeneousVolume(params);
+    OSL_HOSTDEVICE static HomogeneousMedium* create(void* storage, const MediumParams& params) {
+        HomogeneousMedium* volume = new (storage) HomogeneousMedium(params);
         volume->phase_func = new HenyeyGreenstein(params.medium_g);
         return volume;
     }
@@ -1578,12 +1577,11 @@ struct HomogeneousVolume final : public Medium {
         Vec3 rand_vol = sampler.get();
 
         float t_volume = -logf(1.0f - rand_vol.x) / params.avg_sigma_t();
-        bool volume_scatter = (t_volume < hit.t);
 
         Color3 weight;
         Color3 tr;
         
-        if (volume_scatter) {
+        if (t_volume < hit.t) {
             r.origin = r.point(t_volume);
             tr = transmittance(t_volume);
 
@@ -1599,7 +1597,7 @@ struct HomogeneousVolume final : public Medium {
             );
         }
         
-        return Medium::Sample { volume_scatter, t_volume, tr, weight };
+        return Medium::Sample { t_volume, tr, weight };
     }
 
     OSL_HOSTDEVICE const MediumParams* get_params() const {
@@ -1614,22 +1612,22 @@ struct HomogeneousVolume final : public Medium {
     }
 };
 
-struct EmptyVolume final : public Medium {
+struct EmptyMedium final : public Medium {
     MediumParams params;
 
-    OSL_HOSTDEVICE EmptyVolume(const MediumParams& params)
+    OSL_HOSTDEVICE EmptyMedium(const MediumParams& params)
         : Medium(this), params(params)
     {
     }
 
-    OSL_HOSTDEVICE static EmptyVolume* create(void* storage, const MediumParams& params) {
-        EmptyVolume* volume = new (storage) EmptyVolume(params);
+    OSL_HOSTDEVICE static EmptyMedium* create(void* storage, const MediumParams& params) {
+        EmptyMedium* volume = new (storage) EmptyMedium(params);
         return volume;
     }
 
     OSL_HOSTDEVICE Medium::Sample sample(Ray& ray, Sampler &sampler, Intersection& hit) const
     {
-        return { false, 0.0f, Color3(1.0f), Color3(1.0f) };
+        return { 0.0f, Color3(1.0f), Color3(1.0f) };
     }
 
     OSL_HOSTDEVICE const MediumParams* get_params() const {
@@ -1781,9 +1779,9 @@ process_medium_closure(const ShaderGlobalsType& sg, float path_roughness,
 
             if (!sg.backfacing) { // if entering 
                 if (result.medium_data.is_vaccum()) {
-                    medium_stack.add_medium<EmptyVolume>(result.medium_data);
+                    medium_stack.add_medium<EmptyMedium>(result.medium_data);
                 } else {
-                    medium_stack.add_medium<HomogeneousVolume>(result.medium_data);
+                    medium_stack.add_medium<HomogeneousMedium>(result.medium_data);
                 }
             }
 
@@ -1810,9 +1808,9 @@ process_medium_closure(const ShaderGlobalsType& sg, float path_roughness,
                         
             if (!sg.backfacing) { // if entering 
                 if (result.medium_data.is_vaccum()) {
-                    medium_stack.add_medium<EmptyVolume>(result.medium_data);
+                    medium_stack.add_medium<EmptyMedium>(result.medium_data);
                 } else {
-                    medium_stack.add_medium<HomogeneousVolume>(result.medium_data);
+                    medium_stack.add_medium<HomogeneousMedium>(result.medium_data);
                 }
             }
 
diff --git a/src/testrender/shading.h b/src/testrender/shading.h
@@ -298,8 +298,8 @@ struct CharlieSheen;
 struct SpiThinLayer;
 struct HenyeyGreenstein;
 
-struct HomogeneousVolume;
-struct EmptyVolume;
+struct HomogeneousMedium;
+struct EmptyMedium;
 
 // StaticVirtual generates a switch/case dispatch method for us given
 // a list of possible subtypes. We just need to forward declare them.
@@ -312,7 +312,7 @@ using AbstractBSDF = bsdl::StaticVirtual<
     MxGeneralizedSchlickOpaque, MxGeneralizedSchlick, SpiThinLayer,
     HenyeyGreenstein>;
 
-using AbstractMedium = bsdl::StaticVirtual<HomogeneousVolume, EmptyVolume>;
+using AbstractMedium = bsdl::StaticVirtual<HomogeneousMedium, EmptyMedium>;
 
 // Then we just need to inherit from AbstractBSDF or AbstractMedium 
 
@@ -382,18 +382,17 @@ struct has_equal<T, std::void_t<decltype(std::declval<const T&>() == std::declva
 struct Medium : public AbstractMedium {
     struct Sample {
         OSL_HOSTDEVICE Sample() : 
-            scatter(false), t(0.0f), transmittance(0.0f), weight(0.0f)
+            t(0.0f), transmittance(0.0f), weight(0.0f)
         {
         }
         OSL_HOSTDEVICE Sample(const Sample& o) : 
-            scatter(o.scatter), t(o.t), transmittance(o.transmittance), weight(o.weight)
+            t(o.t), transmittance(o.transmittance), weight(o.weight)
         {
         }
-        OSL_HOSTDEVICE Sample(bool scatter, float t, Color3 transmittance, Color3 weight) : 
-            scatter(scatter), t(t), transmittance(transmittance), weight(weight)
+        OSL_HOSTDEVICE Sample(float t, Color3 transmittance, Color3 weight) : 
+            t(t), transmittance(transmittance), weight(weight)
         {
         }
-        bool scatter; 
         float t;
         Color3 transmittance;
         Color3 weight;
@@ -571,21 +570,22 @@ struct MediumStack {
 
     OSL_HOSTDEVICE int size() const { return depth; }
 
-    OSL_HOSTDEVICE bool integrate(Ray& r, Sampler& sampler, Intersection& hit, Color3& path_weight, Color3& path_radiance, float& bsdf_pdf) const 
+   OSL_HOSTDEVICE bool integrate(Ray& r, Sampler& sampler, Intersection& hit, Color3& path_weight, Color3& path_radiance, float& bsdf_pdf) const 
     {
         if (depth <= 0) {
             return false;
         }
         
-        Medium::Sample combined_sample{ false, 1.0f, Color3(1.0f), Color3(1.0f) };
+        Medium::Sample combined_sample{ 1.0f, Color3(1.0f), Color3(1.0f) };
+        bool scatter = false;
         
         for (int i = 0; i < depth; ++i) {
             Medium::Sample s = mediums[i]->sample_vrtl(r, sampler, hit);
             
             combined_sample.transmittance *= s.transmittance;
             combined_sample.weight *= s.weight;
             
-            combined_sample.scatter = s.scatter || combined_sample.scatter;
+            scatter = s.t < hit.t || scatter;
             combined_sample.t = s.t < combined_sample.t ? s.t : combined_sample.t;
         }
 
@@ -596,8 +596,8 @@ struct MediumStack {
         path_weight *= combined_sample.transmittance;
 
         Vec3 rand_phase = sampler.get();
-        if (combined_sample.scatter) {
-            if (!mediums[0]->phase_func) {
+        if (scatter) {
+            if (!mediums[0]->phase_func) { // EmptyMedium won't have one
                 return false;
             }
             BSDF::Sample phase_sample = mediums[0]->phase_func->sample_vrtl(-r.direction, 
diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out.exr b/testsuite/render-mx-anisotropic-vdf/ref/out.exr
diff --git a/testsuite/render-mx-anisotropic-vdf/scene.xml b/testsuite/render-mx-anisotropic-vdf/scene.xml
@@ -23,7 +23,7 @@
 
    <ShaderGroup>
       param color albedo 0.75 0.75 0.75;
-      param float extinction 0.005;
+      param float extinction 0.001;
       param float anisotropy 0.9;
 
       shader anisotropic layer1;
diff --git a/testsuite/render-mx-medium-vdf-glass/glossy.osl b/testsuite/render-mx-medium-vdf-glass/glossy.osl
@@ -37,5 +37,5 @@ glossy
     float alpha_x = alpha * (1.0 - anisotropy);
     float alpha_y = alpha;
     vector U = normalize(cross(N, dPdv));
-    Ci = dielectric_bsdf(N, U, Cr, Ct, alpha_x, alpha_y, ior, "ggx") + medium_vdf(color(0.5), transmission_depth, Cr, 0.0, ior, priority);
+    Ci = dielectric_bsdf(N, U, Cr, Ct, alpha_x, alpha_y, ior, "ggx") + medium_vdf(color(0.5), transmission_depth, color(0.5), 0.0, ior, priority);
 }
diff --git a/testsuite/render-mx-medium-vdf-glass/ref/out.exr b/testsuite/render-mx-medium-vdf-glass/ref/out.exr
diff --git a/testsuite/render-mx-medium-vdf-glass/run.py b/testsuite/render-mx-medium-vdf-glass/run.py
@@ -7,4 +7,4 @@
 failthresh = 0.01
 failpercent = 1
 outputs = [ "out.exr" ]
-command = testrender("-r 196 196 -aa 16 scene.xml out.exr")
+command = testrender("-r 240 240 -aa 24 scene.xml out.exr")
diff --git a/testsuite/render-mx-medium-vdf-glass/scene.xml b/testsuite/render-mx-medium-vdf-glass/scene.xml
@@ -17,43 +17,70 @@
 
 
 
-   <!-- Spheres testing priority -->
+   <!-- Spheres testing special  priority -->
    <ShaderGroup>
-      color Cr 0.0 0.0 1.0;
+      color Cr 1.0 1.0 1.0;
       float roughness 0.1;
       float anisotropy 0.0;
-      float ior 1.2;
-      int priority 1;
+      float ior 1.1;
+      int priority 0;
       float transmission_depth 100.0;
       float medium_anisotropy -1.0;
-      int priority 1;
+      int priority 0;
       shader glossy layer1;
    </ShaderGroup>
-   <Sphere center="30,30,50" radius="20" />
+   <Sphere center="40,70,70" radius="15" />
 
    <ShaderGroup>
       color Cr 1.0 1.0 1.0;
+      float roughness 0.1;
+      float anisotropy 0.0;
+      float ior 1.1;
+      int priority 0;
+      float transmission_depth 100.0;
+      float medium_anisotropy -1.0;
+      int priority 0;
+      shader glossy layer1;
+   </ShaderGroup>
+   <Sphere center="60,70,70" radius="15" />
+
+   <!-- Spheres testing priority -->
+   <ShaderGroup>
+      color Cr 0.0 0.0 1.0;
+      float roughness 0.1;
+      float anisotropy 0.0;
+      float ior 1.2;
+      int priority 0;
+      float transmission_depth 500.0;
+      float medium_anisotropy 0.0;
+      int priority 0;
+      shader glossy layer1;
+   </ShaderGroup>
+   <Sphere center="30,30,70" radius="20" />
+
+   <ShaderGroup>
+      color Cr 0.0 1.0 0.0;
       float roughness 0.2;
       float anisotropy 0.0;
-      float ior 1.4;
-      float transmission_depth 20.0;
+      float ior 1.1;
+      float transmission_depth 500.0;
       float medium_anisotropy 0.0;
-      int priority 2;
+      int priority 1;
       shader glossy layer1;
    </ShaderGroup>
-   <Sphere center="50,50,50" radius="30" />
+   <Sphere center="50,30,70" radius="20" />
    
    <ShaderGroup>
       color Cr 1.0 0.0 0.0;
       float roughness 0.3;
       float anisotropy 0.0;
-      float ior 1.8;
-      float transmission_depth 50.0;
-      float medium_anisotropy 1.0;
-      int priority 3;
+      float ior 1.1;
+      float transmission_depth 500.0;
+      float medium_anisotropy 0.0;
+      int priority 2;
       shader glossy layer1;
    </ShaderGroup>
-   <Sphere center="70,30,50" radius="20" />
+   <Sphere center="70,30,70" radius="20" />
    
 
 </World>
diff --git a/testsuite/render-mx-medium-vdf/ref/out.exr b/testsuite/render-mx-medium-vdf/ref/out.exr
diff --git a/testsuite/render-mx-medium-vdf/run.py b/testsuite/render-mx-medium-vdf/run.py
@@ -7,4 +7,4 @@
 failthresh = 0.01
 failpercent = 1
 outputs = [ "out.exr" ]
-command = testrender("-v -r 160 240 -aa 64 scene.xml out.exr")
+command = testrender("-v -r 196 196 -aa 96 scene.xml out.exr")
diff --git a/testsuite/render-mx-medium-vdf/scene.xml b/testsuite/render-mx-medium-vdf/scene.xml
@@ -2,7 +2,7 @@
    <Camera eye="0, -1, 80" look_at="0,-1,0" fov="10.0" />
 
    <ShaderGroup is_light="yes">
-      vector sun_dir 0.0 0.5 1.0;
+      vector sun_dir 0.0 0.75 1.0;
       shader envmap layer1;
    </ShaderGroup>
    <Background resolution="1024" />
@@ -15,65 +15,73 @@
    <Quad corner="-5,-5,-5" edge_x="10,0,0" edge_y="0,10,0" /> <!-- Back -->
 
 
-   <!-- 12 o'clock -->
+   <!-- Red, Blue, Green -->
    <ShaderGroup>
       param color albedo 0.5 0.5 0.5;
       param float transmission_depth 1.0;
       param color transmission_color 1.0 0.2 0.2;
       param float anisotropy 0.0;
-      param float ior 1.0; 
+      param float ior 0.0; 
       param int priority 1; 
       shader medium layer1;
    </ShaderGroup>
-   <Sphere center="0,1.1,0" radius="0.95" /> 
+   <Sphere center="-2,1,0" radius="0.95" /> 
 
-   <!-- 10 o'clock -->
    <ShaderGroup>
       param color albedo 0.5 0.5 0.5;
       param float transmission_depth 1.0;
-      param color transmission_color 1.0 0.6 0.2;
+      param color transmission_color 0.2 0.4 1.0;
       param float anisotropy 0.0;
-      param float ior 1.0; 
+      param float ior 0.0; 
       param int priority 1; 
       shader medium layer1;
    </ShaderGroup>
-   <Sphere center="-1.045,0.34,0" radius="0.95" /> 
+   <Sphere center="0,1,0" radius="0.95" /> 
 
-   <!-- 2 o'clock -->
    <ShaderGroup>
       param color albedo 0.5 0.5 0.5;
       param float transmission_depth 1.0;
-      param color transmission_color 0.2 0.4 1.0;
+      param color transmission_color 0.2 1.0 0.2;
       param float anisotropy 0.0;
       param float ior 1.0; 
       param int priority 1; 
       shader medium layer1;
    </ShaderGroup>
-   <Sphere center="1.045,0.34,0" radius="0.95" /> 
+   <Sphere center="2,1,0" radius="0.95" /> 
 
-   <!-- 8 o'clock -->
+   <!-- Grey spheres with varying anisotropy -->
    <ShaderGroup>
       param color albedo 0.5 0.5 0.5;
-      param float transmission_depth 1.0;
-      param color transmission_color 1.0 1.0 0.2;
-      param float anisotropy 0.0;
+      param float transmission_depth 10.0;
+      param color transmission_color 0.5 0.5 0.5;
+      param float anisotropy -0.5;
       param float ior 1.0; 
       param int priority 1; 
       shader medium layer1;
    </ShaderGroup>
-   <Sphere center="-0.65,-0.89,0" radius="0.95" /> 
+   <Sphere center="-2,-1,0" radius="0.95" /> 
 
-   <!-- 4 o'clock -->
    <ShaderGroup>
       param color albedo 0.5 0.5 0.5;
-      param float transmission_depth 1.0;
-      param color transmission_color 0.2 1.0 0.2;
+      param float transmission_depth 10.0;
+      param color transmission_color 0.5 0.5 0.5;
       param float anisotropy 0.0;
       param float ior 1.0; 
       param int priority 1; 
       shader medium layer1;
    </ShaderGroup>
-   <Sphere center="0.65,-0.89,0" radius="0.95" /> 
+   <Sphere center="0,-1,0" radius="0.95" /> 
+
+   <ShaderGroup>
+      param color albedo 0.5 0.5 0.5;
+      param float transmission_depth 10.0;
+      param color transmission_color 0.5 0.5 0.5;
+      param float anisotropy 0.5;
+      param float ior 1.0; 
+      param int priority 1; 
+      shader medium layer1;
+   </ShaderGroup>
+   <Sphere center="2,-1,0" radius="0.95" /> 
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -1553,22 +1553,21 @@ struct HenyeyGreenstein final : public BSDF {`
`1553`	`1553`	`Vec3 wi = frame.toworld(local_wi);`
`1554`	`1554`	`float pdf_val = PhaseHG(cos_theta, g);`
`1555`	`1555`
`1556`		`- Color3 weight = Color3(1.0f);`
`1557`		`- return { wi, weight, pdf_val, 0.0f };`
	`1556`	`+ return { wi, Color3(1.0f), pdf_val, 0.0f };`
`1558`	`1557`	`}`
`1559`	`1558`
`1560`	`1559`	`};`
`1561`	`1560`
`1562`		`-struct HomogeneousVolume final : public Medium {`
	`1561`	`+struct HomogeneousMedium final : public Medium {`
`1563`	`1562`	`MediumParams params;`
`1564`	`1563`
`1565`		`- OSL_HOSTDEVICE HomogeneousVolume(const MediumParams& params)`
	`1564`	`+ OSL_HOSTDEVICE HomogeneousMedium(const MediumParams& params)`
`1566`	`1565`	`: Medium(this), params(params)`
`1567`	`1566`	`{`
`1568`	`1567`	`}`
`1569`	`1568`
`1570`		`- OSL_HOSTDEVICE static HomogeneousVolume* create(void* storage, const MediumParams& params) {`
`1571`		`- HomogeneousVolume* volume = new (storage) HomogeneousVolume(params);`
	`1569`	`+ OSL_HOSTDEVICE static HomogeneousMedium* create(void* storage, const MediumParams& params) {`
	`1570`	`+ HomogeneousMedium* volume = new (storage) HomogeneousMedium(params);`
`1572`	`1571`	`volume->phase_func = new HenyeyGreenstein(params.medium_g);`
`1573`	`1572`	`return volume;`
`1574`	`1573`	`}`
`@@ -1578,12 +1577,11 @@ struct HomogeneousVolume final : public Medium {`
`1578`	`1577`	`Vec3 rand_vol = sampler.get();`
`1579`	`1578`
`1580`	`1579`	`float t_volume = -logf(1.0f - rand_vol.x) / params.avg_sigma_t();`
`1581`		`- bool volume_scatter = (t_volume < hit.t);`
`1582`	`1580`
`1583`	`1581`	`Color3 weight;`
`1584`	`1582`	`Color3 tr;`
`1585`	`1583`
`1586`		`- if (volume_scatter) {`
	`1584`	`+ if (t_volume < hit.t) {`
`1587`	`1585`	`r.origin = r.point(t_volume);`
`1588`	`1586`	`tr = transmittance(t_volume);`
`1589`	`1587`
`@@ -1599,7 +1597,7 @@ struct HomogeneousVolume final : public Medium {`
`1599`	`1597`	`);`
`1600`	`1598`	`}`
`1601`	`1599`
`1602`		`- return Medium::Sample { volume_scatter, t_volume, tr, weight };`
	`1600`	`+ return Medium::Sample { t_volume, tr, weight };`
`1603`	`1601`	`}`
`1604`	`1602`
`1605`	`1603`	`OSL_HOSTDEVICE const MediumParams* get_params() const {`
`@@ -1614,22 +1612,22 @@ struct HomogeneousVolume final : public Medium {`
`1614`	`1612`	`}`
`1615`	`1613`	`};`
`1616`	`1614`
`1617`		`-struct EmptyVolume final : public Medium {`
	`1615`	`+struct EmptyMedium final : public Medium {`
`1618`	`1616`	`MediumParams params;`
`1619`	`1617`
`1620`		`- OSL_HOSTDEVICE EmptyVolume(const MediumParams& params)`
	`1618`	`+ OSL_HOSTDEVICE EmptyMedium(const MediumParams& params)`
`1621`	`1619`	`: Medium(this), params(params)`
`1622`	`1620`	`{`
`1623`	`1621`	`}`
`1624`	`1622`
`1625`		`- OSL_HOSTDEVICE static EmptyVolume* create(void* storage, const MediumParams& params) {`
`1626`		`- EmptyVolume* volume = new (storage) EmptyVolume(params);`
	`1623`	`+ OSL_HOSTDEVICE static EmptyMedium* create(void* storage, const MediumParams& params) {`
	`1624`	`+ EmptyMedium* volume = new (storage) EmptyMedium(params);`
`1627`	`1625`	`return volume;`
`1628`	`1626`	`}`
`1629`	`1627`
`1630`	`1628`	`OSL_HOSTDEVICE Medium::Sample sample(Ray& ray, Sampler &sampler, Intersection& hit) const`
`1631`	`1629`	`{`
`1632`		`- return { false, 0.0f, Color3(1.0f), Color3(1.0f) };`
	`1630`	`+ return { 0.0f, Color3(1.0f), Color3(1.0f) };`
`1633`	`1631`	`}`
`1634`	`1632`
`1635`	`1633`	`OSL_HOSTDEVICE const MediumParams* get_params() const {`
`@@ -1781,9 +1779,9 @@ process_medium_closure(const ShaderGlobalsType& sg, float path_roughness,`
`1781`	`1779`
`1782`	`1780`	`if (!sg.backfacing) { // if entering`
`1783`	`1781`	`if (result.medium_data.is_vaccum()) {`
`1784`		`- medium_stack.add_medium<EmptyVolume>(result.medium_data);`
	`1782`	`+ medium_stack.add_medium<EmptyMedium>(result.medium_data);`
`1785`	`1783`	`} else {`
`1786`		`- medium_stack.add_medium<HomogeneousVolume>(result.medium_data);`
	`1784`	`+ medium_stack.add_medium<HomogeneousMedium>(result.medium_data);`
`1787`	`1785`	`}`
`1788`	`1786`	`}`
`1789`	`1787`
`@@ -1810,9 +1808,9 @@ process_medium_closure(const ShaderGlobalsType& sg, float path_roughness,`
`1810`	`1808`
`1811`	`1809`	`if (!sg.backfacing) { // if entering`
`1812`	`1810`	`if (result.medium_data.is_vaccum()) {`
`1813`		`- medium_stack.add_medium<EmptyVolume>(result.medium_data);`
	`1811`	`+ medium_stack.add_medium<EmptyMedium>(result.medium_data);`
`1814`	`1812`	`} else {`
`1815`		`- medium_stack.add_medium<HomogeneousVolume>(result.medium_data);`
	`1813`	`+ medium_stack.add_medium<HomogeneousMedium>(result.medium_data);`
`1816`	`1814`	`}`
`1817`	`1815`	`}`
`1818`	`1816`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ glossy`
`37`	`37`	`float alpha_x = alpha * (1.0 - anisotropy);`
`38`	`38`	`float alpha_y = alpha;`
`39`	`39`	`vector U = normalize(cross(N, dPdv));`
`40`		`- Ci = dielectric_bsdf(N, U, Cr, Ct, alpha_x, alpha_y, ior, "ggx") + medium_vdf(color(0.5), transmission_depth, Cr, 0.0, ior, priority);`
	`40`	`+ Ci = dielectric_bsdf(N, U, Cr, Ct, alpha_x, alpha_y, ior, "ggx") + medium_vdf(color(0.5), transmission_depth, color(0.5), 0.0, ior, priority);`
`41`	`41`	`}`