diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake index 1f94483a66..8fdf5b592e 100644 --- a/src/cmake/testing.cmake +++ b/src/cmake/testing.cmake @@ -374,7 +374,7 @@ macro (osl_add_all_tests) render-mx-sheen render-mx-medium-vdf render-mx-medium-vdf-glass - render-microfacet render-oren-nayar + render-microfacet render-oren-nayar render-spi-thinlayer render-uv render-veachmis render-ward render-raytypes diff --git a/testsuite/render-background/ref/out-macos-alt.exr b/testsuite/render-background/ref/out-macos-alt.exr deleted file mode 100644 index ba80f0cc7b..0000000000 Binary files a/testsuite/render-background/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-background/ref/out-optix-alt.exr b/testsuite/render-background/ref/out-optix-alt.exr index 452ced070b..196baf7b0b 100644 Binary files a/testsuite/render-background/ref/out-optix-alt.exr and b/testsuite/render-background/ref/out-optix-alt.exr differ diff --git a/testsuite/render-background/ref/out.exr b/testsuite/render-background/ref/out.exr index ea78b62634..c2930b7df0 100644 Binary files a/testsuite/render-background/ref/out.exr and b/testsuite/render-background/ref/out.exr differ diff --git a/testsuite/render-background/run.py b/testsuite/render-background/run.py index 956373a36f..f4775e2b91 100755 --- a/testsuite/render-background/run.py +++ b/testsuite/render-background/run.py @@ -11,4 +11,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 4 --options statistics:level=1 scene.xml out.exr") +command = testrender("-r 160 120 -aa 4 --options statistics:level=1 scene.xml out.exr") diff --git a/testsuite/render-bumptest/ref/out-macos.exr b/testsuite/render-bumptest/ref/out-macos.exr new file mode 100644 index 0000000000..4515d35dcd Binary files /dev/null and b/testsuite/render-bumptest/ref/out-macos.exr differ diff --git a/testsuite/render-bumptest/ref/out-optix-alt.exr b/testsuite/render-bumptest/ref/out-optix-alt.exr index 3371916bd0..54103ead96 100644 Binary files a/testsuite/render-bumptest/ref/out-optix-alt.exr and b/testsuite/render-bumptest/ref/out-optix-alt.exr differ diff --git a/testsuite/render-bumptest/ref/out.exr b/testsuite/render-bumptest/ref/out.exr index bd6a829035..afbcd78467 100644 Binary files a/testsuite/render-bumptest/ref/out.exr and b/testsuite/render-bumptest/ref/out.exr differ diff --git a/testsuite/render-bumptest/run.py b/testsuite/render-bumptest/run.py index f6d926821d..1320cddd25 100755 --- a/testsuite/render-bumptest/run.py +++ b/testsuite/render-bumptest/run.py @@ -9,6 +9,6 @@ hardfail = 0.035 outputs = [ "out.exr" ] -command = testrender("-r 256 256 -aa 4 --llvm_opt 13 bumptest.xml out.exr") +command = testrender("-r 128 128 -aa 4 --llvm_opt 13 bumptest.xml out.exr") # Note: we pick this test arbitrarily as the one to verify llvm_opt=13 works diff --git a/testsuite/render-bunny/ref/out-macos-alt.exr b/testsuite/render-bunny/ref/out-macos-alt.exr deleted file mode 100644 index e7be3a12b0..0000000000 Binary files a/testsuite/render-bunny/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-bunny/ref/out-optix-alt.exr b/testsuite/render-bunny/ref/out-optix-alt.exr index db5e84a67f..cad2bea1c5 100644 Binary files a/testsuite/render-bunny/ref/out-optix-alt.exr and b/testsuite/render-bunny/ref/out-optix-alt.exr differ diff --git a/testsuite/render-bunny/ref/out.exr b/testsuite/render-bunny/ref/out.exr index 3a96085188..fe809fb2db 100644 Binary files a/testsuite/render-bunny/ref/out.exr and b/testsuite/render-bunny/ref/out.exr differ diff --git a/testsuite/render-bunny/run.py b/testsuite/render-bunny/run.py index c823917078..312e96c053 100755 --- a/testsuite/render-bunny/run.py +++ b/testsuite/render-bunny/run.py @@ -7,4 +7,4 @@ failthresh = 0.01 failpercent = 1 outputs = [ "out.exr" ] -command = testrender("-r 256 256 -aa 8 bunny.xml out.exr") +command = testrender("-r 128 128 -aa 8 bunny.xml out.exr") diff --git a/testsuite/render-cornell/ref/out-optix-alt.exr b/testsuite/render-cornell/ref/out-optix-alt.exr index d5a2355b20..e2fad59581 100644 Binary files a/testsuite/render-cornell/ref/out-optix-alt.exr and b/testsuite/render-cornell/ref/out-optix-alt.exr differ diff --git a/testsuite/render-cornell/ref/out.exr b/testsuite/render-cornell/ref/out.exr index 0055767131..c915a91a4b 100644 Binary files a/testsuite/render-cornell/ref/out.exr and b/testsuite/render-cornell/ref/out.exr differ diff --git a/testsuite/render-cornell/run.py b/testsuite/render-cornell/run.py index 106e67bf5a..1bcbacee23 100755 --- a/testsuite/render-cornell/run.py +++ b/testsuite/render-cornell/run.py @@ -7,6 +7,6 @@ failthresh = 0.01 failpercent = 1 outputs = [ "out.exr" ] -command = testrender("-r 256 256 -aa 4 --llvm_opt 12 cornell.xml out.exr") +command = testrender("-r 128 128 -aa 4 --llvm_opt 12 cornell.xml out.exr") # Note: we pick this test arbitrarily as the one to verify llvm_opt=12 works diff --git a/testsuite/render-displacement/ref/out-alt-icx.exr b/testsuite/render-displacement/ref/out-alt-icx.exr new file mode 100644 index 0000000000..ffd4e5b487 Binary files /dev/null and b/testsuite/render-displacement/ref/out-alt-icx.exr differ diff --git a/testsuite/render-displacement/ref/out-alt-macos-arm-debug.exr b/testsuite/render-displacement/ref/out-alt-macos-arm-debug.exr index 56587dfff7..2de6365051 100644 Binary files a/testsuite/render-displacement/ref/out-alt-macos-arm-debug.exr and b/testsuite/render-displacement/ref/out-alt-macos-arm-debug.exr differ diff --git a/testsuite/render-displacement/ref/out-alt1.exr b/testsuite/render-displacement/ref/out-alt1.exr deleted file mode 100644 index ae3616c6a8..0000000000 Binary files a/testsuite/render-displacement/ref/out-alt1.exr and /dev/null differ diff --git a/testsuite/render-displacement/ref/out-alticx.exr b/testsuite/render-displacement/ref/out-alticx.exr deleted file mode 100644 index 124fd78ea6..0000000000 Binary files a/testsuite/render-displacement/ref/out-alticx.exr and /dev/null differ diff --git a/testsuite/render-displacement/ref/out.exr b/testsuite/render-displacement/ref/out.exr index fb504358a1..7242c068e3 100644 Binary files a/testsuite/render-displacement/ref/out.exr and b/testsuite/render-displacement/ref/out.exr differ diff --git a/testsuite/render-displacement/run.py b/testsuite/render-displacement/run.py index 9552e69959..c285deb450 100755 --- a/testsuite/render-displacement/run.py +++ b/testsuite/render-displacement/run.py @@ -7,4 +7,4 @@ failthresh = 0.01 failpercent = 1 outputs = [ "out.exr" ] -command = testrender("-r 256 256 -aa 8 scene.xml out.exr") +command = testrender("-r 128 128 -aa 8 scene.xml out.exr") diff --git a/testsuite/render-furnace-diffuse/ref/out-optix-alt.exr b/testsuite/render-furnace-diffuse/ref/out-optix-alt.exr index dce1374be9..f5b31b4e4b 100644 Binary files a/testsuite/render-furnace-diffuse/ref/out-optix-alt.exr and b/testsuite/render-furnace-diffuse/ref/out-optix-alt.exr differ diff --git a/testsuite/render-furnace-diffuse/ref/out.exr b/testsuite/render-furnace-diffuse/ref/out.exr index c90bbdedc0..a16efca6c3 100644 Binary files a/testsuite/render-furnace-diffuse/ref/out.exr and b/testsuite/render-furnace-diffuse/ref/out.exr differ diff --git a/testsuite/render-furnace-diffuse/run.py b/testsuite/render-furnace-diffuse/run.py index 75cb6c5006..371bc079c2 100755 --- a/testsuite/render-furnace-diffuse/run.py +++ b/testsuite/render-furnace-diffuse/run.py @@ -5,4 +5,4 @@ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 20 scene.xml out.exr") +command = testrender("-r 160 120 -aa 20 scene.xml out.exr") diff --git a/testsuite/render-material-layer/OPTIX b/testsuite/render-material-layer/OPTIX deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testsuite/render-material-layer/checkerboard.osl b/testsuite/render-material-layer/checkerboard.osl deleted file mode 100644 index 990db29226..0000000000 --- a/testsuite/render-material-layer/checkerboard.osl +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright Contributors to the Open Shading Language project. -// SPDX-License-Identifier: BSD-3-Clause -// https://github.com/AcademySoftwareFoundation/OpenShadingLanguage - - -shader -checkerboard - [[ string description = "Procedural checkerboard" ]] -( - float s = u - [[ string description = "s coordinate for the lookup", - float UImin = 0, float UIsoftmax = 1 ]], - float t = v - [[ string description = "t coordinate for the lookup", - float UImin = 0, float UIsoftmax = 1 ]], - float scale_s = 4 - [[ string description = "scale factor for s coordinate" ]], - float scale_t = 4 - [[ string description = "scale factor for t coordinate" ]], - color Ca = color(1, 1, 1) - [[ string description = "color of even squares" ]], - color Cb = color(0, 0, 0) - [[ string description = "color of odd squares" ]], - output color Cout = 0 - [[ string description = "Output color", - float UImin = 0, float UImax = 1 ]], - output float Fout = 0 - ) -{ -// TODO: anti-alias - float cs = fmod(s * scale_s, 2); - float ct = fmod(t * scale_t, 2); - if ((int(cs) ^ int(ct)) == 0) - Cout = Ca; - else - Cout = Cb; - - Fout = luminance(Cout); -} diff --git a/testsuite/render-material-layer/emitter.osl b/testsuite/render-material-layer/emitter.osl deleted file mode 100644 index 7c8c6d4756..0000000000 --- a/testsuite/render-material-layer/emitter.osl +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright Contributors to the Open Shading Language project. -// SPDX-License-Identifier: BSD-3-Clause -// https://github.com/AcademySoftwareFoundation/OpenShadingLanguage - - -surface -emitter - [[ string description = "Lambertian emitter material" ]] -( - float power = 1 - [[ string description = "Total power of the light", - float UImin = 0 ]], - color Cs = 1 - [[ string description = "Base color", - float UImin = 0, float UImax = 1 ]] - ) -{ - // Because emission() returns a radiance that, integrated over all - // angles, yields a power density of 1, we multiply by the desired - // total power and divide by the total surface area. In this - // manner, the 'power' parameter gives the total power of the light - // (e.g., in Watts) independently of its physical size or shape - // (which may be changed to affect shadow softness without altering - // overall illumination). N.B.: The total power is BEFORE Cs - // filters the color! - Ci = (power / surfacearea()) * Cs * emission(); -} diff --git a/testsuite/render-material-layer/material-layer.xml b/testsuite/render-material-layer/material-layer.xml deleted file mode 100644 index 390eb97699..0000000000 --- a/testsuite/render-material-layer/material-layer.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - diff --git a/testsuite/render-material-layer/matte.osl b/testsuite/render-material-layer/matte.osl deleted file mode 100644 index a8c6f187e4..0000000000 --- a/testsuite/render-material-layer/matte.osl +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright Contributors to the Open Shading Language project. -// SPDX-License-Identifier: BSD-3-Clause -// https://github.com/AcademySoftwareFoundation/OpenShadingLanguage - - -surface -matte - [[ string description = "Lambertian diffuse material" ]] -( - float Kd = 1 - [[ string description = "Diffuse scaling", - float UImin = 0, float UIsoftmax = 1 ]], - color Cs = 1 - [[ string description = "Base color", - float UImin = 0, float UImax = 1 ]] - ) -{ - Ci = Kd * Cs * diffuse (N); -} diff --git a/testsuite/render-material-layer/phong.osl b/testsuite/render-material-layer/phong.osl deleted file mode 100644 index 79fac87b14..0000000000 --- a/testsuite/render-material-layer/phong.osl +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright Contributors to the Open Shading Language project. -// SPDX-License-Identifier: BSD-3-Clause -// https://github.com/AcademySoftwareFoundation/OpenShadingLanguage - - -surface -phong - [[ string description = "Phong specular material" ]] -( - float Ks = 1 - [[ string description = "Specular scaling", - float UImin = 0, float UIsoftmax = 1 ]], - float exponent = 10 - [[ string description = "Phong exponent (higher is sharper)", - float UImin = 1, float UIsoftmax = 100 ]], - color Cs = 1 - [[ string description = "Base color", - float UImin = 0, float UImax = 1 ]] - ) -{ - Ci = Ks * Cs * phong (N, exponent); -} diff --git a/testsuite/render-material-layer/ref/out.exr b/testsuite/render-material-layer/ref/out.exr deleted file mode 100644 index a46dfc1bed..0000000000 Binary files a/testsuite/render-material-layer/ref/out.exr and /dev/null differ diff --git a/testsuite/render-material-layer/run.py b/testsuite/render-material-layer/run.py deleted file mode 100755 index f70112c4c7..0000000000 --- a/testsuite/render-material-layer/run.py +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright Contributors to the Open Shading Language project. -# SPDX-License-Identifier: BSD-3-Clause -# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage -#!/usr/bin/python - -outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 4 material-layer.xml out.exr") diff --git a/testsuite/render-material-layer/ubersurface.osl b/testsuite/render-material-layer/ubersurface.osl deleted file mode 100644 index b954b1831e..0000000000 --- a/testsuite/render-material-layer/ubersurface.osl +++ /dev/null @@ -1,334 +0,0 @@ -// Copyright Contributors to the Open Shading Language project. -// SPDX-License-Identifier: BSD-3-Clause -// https://github.com/AcademySoftwareFoundation/OpenShadingLanguage -// -// ubersurface.osl -// -// -// A demonstration of writing a production-like generalized surface shader in OSL -// This shader combines diffuse, specular, refractive and emissive closure to create -// a flexible material description. -// -// See the help metadata on the parameters for usage info. Hopefully much of it is -// self-explanatory. -// -// Author: Adam S. Martinez -// Date: August 5th, 2011 -// Soundtrack: Gojira - Flying Whales -// -// August 2013: -// This update employs a simple material layering mechanism that allows -// two ubersurface shaders to connect and composite in a consistent manner. -// Connecting ubersurfaceB.Out_Ci to ubersurfaceA.Next_Layer results in -// the appearance of ubersurfaceA over ubersurfaceB. -// -// In this logic, opacity of 0 will pass through the top layer and call the -// Next_Layer. Refractive materials will filter Next_Layer according to -// the Refraction_Color. -// -// See testsuite/render-material-layer for an example. -// -// Note: This shader uses the "absorption" closure keyword for -// the microfacet_beckmann_refraction closure. This is currently -// unsupported by the testrender application. -// - - -// The TEXTURE_PARAMS macro defines a set of parameters common to all texture maps. -// The metadata provides parameter display hints to host applications. These metadata -// blocks are in The Foundry's Katana format. -#define TEXTURE_PARAMS(MAPNAME) \ - string Texture_ ## MAPNAME ## _Name = ""\ - [[ string widget = "filename", string help = "A texture file name", \ - string page = #MAPNAME ".Texture"]],\ - float Texture_ ## MAPNAME ## _Blur = 0.0\ - [[ string help = "The blur amount, as a portion of the image size.", \ - string page = #MAPNAME ".Texture"]], \ - float Texture_ ## MAPNAME ## _Width = 1.0 \ - [[ string help = "A multiplier on the surface derivatives. Lower \ - numbers cause larger resolution mip levels to be used.", \ - string page = #MAPNAME ".Texture"]], \ - string Texture_ ## MAPNAME ## _Wrap_Mode = "periodic"\ - [[ string widget = "popup", \ - string options = "black|clamp|file|mirror|periodic",\ - string help = "The U and V wrap mode for this texture. ", \ - string page = #MAPNAME ".Texture"]],\ - float Texture_ ## MAPNAME ## _Scale_U = 1.0\ - [[ string help = "Scales the U texture coordinate prior to texture lookup.", \ - string page = #MAPNAME ".Texture"]], \ - float Texture_ ## MAPNAME ## _Scale_V = 1.0\ - [[ string help = "Scales the V texture coordinate prior to texture lookup.", \ - string page = #MAPNAME ".Texture"]], \ - int Texture_ ## MAPNAME ## _Flip_U = 0\ - [[ string help = "Flips the U texture coordinate prior to texture lookup.", \ - string widget = "checkBox", \ - string page = #MAPNAME ".Texture"]], \ - int Texture_ ## MAPNAME ## _Flip_V = 0\ - [[ string help = "Flips the V texture coordinate prior to texture lookup.", \ - string widget = "checkBox", \ - string page = #MAPNAME ".Texture"]], - -// The evaluate texture function manipulates the texture coordinates and executes the texture() call -// because this function gets called via a macro (defined below), the results are stored in the output -// parameter 'result.' -void evaluateTexture( string texfile, float blur, float width, string wrap, float scale_u, - float scale_v, int flip_u, int flip_v, float uu, float vv, output color result) -{ - if(texfile != "") - { - float u_tex = uu ; - float v_tex = vv ; - - if(flip_u) - u_tex = 1.0 - u_tex; - - if(flip_v) - v_tex = 1.0 - v_tex; - - u_tex *= scale_u; - v_tex *= scale_v; - - result = texture(texfile, u_tex, v_tex, "width", width, "blur", blur, "swrap", wrap, "twrap", wrap); - } -} - -// The following is a float version of the above. Note that the texture() call will return a float value -// representing the first channel found in the texture file. -void evaluateTexture( string texfile, float blur, float width, string wrap, float scale_u, - float scale_v, int flip_u, int flip_v, float uu, float vv, output float result) -{ - if(texfile != "") - { - float u_tex = uu ; - float v_tex = vv ; - - if(flip_u) - u_tex = 1.0 - u_tex; - - if(flip_v) - v_tex = 1.0 - v_tex; - - u_tex *= scale_u; - v_tex *= scale_v; - - result = texture(texfile, u_tex, v_tex, "width", width, "blur", blur, "swrap", wrap, "twrap", wrap); - } -} - -// This macro allows us to easily call the evaluateTexture functions using the texture parameters defined by the -// TEXTURE_PARAMS macro. The parameters are the map definition, which must have an equivalent TEXTURE_PARAMS -// call in the parameter list, and a storage variable for the texture lookup result. -#define TEXTURE_EVAL(MAPNAME, RESULT)\ - evaluateTexture(\ - Texture_ ## MAPNAME ## _Name,\ - Texture_ ## MAPNAME ## _Blur,\ - Texture_ ## MAPNAME ## _Width,\ - Texture_ ## MAPNAME ## _Wrap_Mode,\ - Texture_ ## MAPNAME ## _Scale_U,\ - Texture_ ## MAPNAME ## _Scale_V,\ - Texture_ ## MAPNAME ## _Flip_U,\ - Texture_ ## MAPNAME ## _Flip_V,\ - In_U,\ - In_V,\ - RESULT); - -// The Shader -surface -ubersurface -( - float Opacity = 1 - [[ string help = "The overall opacity of the surface", - string page = "Opacity", - float UImin = 0, float UImax = 1]], - - TEXTURE_PARAMS(Opacity) - - float Kbump = 0 - [[ string help = "The amount to bump the surface by", - string page = "Bump"]], - - TEXTURE_PARAMS(Bump) - - float Kd = 0.5 - [[ string help = "Diffuse closure weight", - string page = "Diffuse", - float UImin = 0, float UImax = 1]], - - color Diffuse_Color = 1 - [[ string help = "Diffuse closure color", - string page = "Diffuse"]], - - TEXTURE_PARAMS(Diffuse) - - float IOR = 1.33 - [[ string help = "The index of refraction for specular effects.", - string page = "Specular"]], - - float Roughness = 0.2 - [[ string help = "The surface roughness for specular effects. A value of 0 forces perfect reflection/refraction.", - string page = "Specular", - float UImin = 0, float UImax = 1]], - - - float Ks = 0.5 - [[ string help = "Specular closure weight", - string page = "Specular", - float UImin = 0, float UImax = 1]], - - color Specular_Color = 1 - [[ string help = "Specular closure color", - string page = "Specular"]], - - TEXTURE_PARAMS(Specular) - - float Kt = 0 - [[ string help = "Transmissive, or refraction, closure weight.", - string page = "Refraction", - float UImin = 0, float UImax = 1]], - - color Refraction_Color = 1 - [[ string help = "Refraction closure color", - string page = "Refraction"]], - - TEXTURE_PARAMS(Refraction) - - color Absorption_Color = 0 - [[ string help = "Color to absorb inside a refractive volume.", - string page = "Refraction"]], - - float Ke = 0 - [[ string help = "Emissive, or incandescent, closure weight.", - string page = "Emission"]], - - color Emission_Color = 1 - [[ string help = "Emissive closure color.", - string page = "Emission"]], - - TEXTURE_PARAMS(Emission) - - // These parameters are provided to use shading variables from external shaders - normal In_Normal = N, - - float In_U = u, - - float In_V = v, - - // Shader Layering - output closure color Out_Ci = 0, - closure color Next_Layer = 0 - -) -{ - - // Nshading will store a modified N if bump mapping is used - normal Nshading = In_Normal; - - // Determine opacity and prepare a transparent closure - float opacity = 1; - TEXTURE_EVAL(Opacity, opacity) - opacity *= Opacity; - closure color transparencyClosure = transparent() * (1.0-opacity); - - // For material layering we have to keep some extra stuff around... - color refractionFilter = 1; - - // Test for shadow rays and exit early, supplying only the transparency closure. - if(raytype("shadow")) { - Out_Ci = transparencyClosure; - - //Naive layering of in shadow context - if(isconnected(Next_Layer)){ - Out_Ci = Out_Ci + Next_Layer; - } - - } else { - // Storage for weighted closures that we will accumulate at the end of this 'beauty' block - closure color diffuseClosure = 0; - closure color specularClosure = 0; - closure color emissionClosure = 0; - closure color refractionClosure = 0; - - // Determine index of refraction based on which side we have hit. - float eta = IOR; - if(backfacing()) eta = 1.0/IOR; - - // Bump - if(Kbump) { - float bumpTexture = 0; - TEXTURE_EVAL(Bump, bumpTexture) - bumpTexture *= Kbump; - if(bumpTexture) { - point Pbump = P + normalize(Nshading) * bumpTexture; - Nshading = normalize(calculatenormal(Pbump)); - } - } - - // Diffuse - if(Kd) { - color diffuseTexture = color(1); - TEXTURE_EVAL(Diffuse, diffuseTexture) - diffuseClosure = diffuse(Nshading) * Kd * Diffuse_Color * diffuseTexture; - } - - // Specular - if(Ks) { - if(Roughness <= 0.005) { - specularClosure = reflection(Nshading, eta); - } else { - specularClosure = microfacet_beckmann(Nshading, Roughness, eta); - } - - color specularTexture = color(1); - TEXTURE_EVAL(Specular, specularTexture) - specularClosure *= specularTexture * Ks * Specular_Color; - } - - // Emission - if(Ke) { - // Because emission() returns a radiance that, integrated over all - // angles, yields a power density of 1, we multiply by the desired - // total power and divide by the total surface area. In this - // manner, the 'Ke' parameter gives the total power of the light - // (e.g., in Watts) independently of its physical size or shape - // (which may be changed to affect shadow softness without altering - // overall illumination). N.B.: The total power is BEFORE Emission_Color - // filters the color! - color emissionTexture = color(1); - TEXTURE_EVAL(Emission, emissionTexture) - emissionClosure = emission() * (Ke / surfacearea()) * Emission_Color * emissionTexture; - } - - - // Refraction - refractionFilter = 1.0-opacity; - if(Kt) { - if(Roughness <= 0.005) { - refractionClosure = refraction(Nshading, eta, "absorption", Absorption_Color); - } else { - refractionClosure = microfacet_beckmann_refraction(Nshading, Roughness, eta, "absorption", Absorption_Color); - } - - color refractionTexture = color(1); - TEXTURE_EVAL(Refraction, refractionTexture) - refractionClosure *= refractionTexture * Kt * Refraction_Color; - // Attenuate diffuse by inverse of refraction Kt. - diffuseClosure *= 1.0-Kt; - refractionFilter = mix(color(1), refractionTexture * Refraction_Color, Kt*opacity ); - } - - // Accumulate and output - Out_Ci = ((diffuseClosure + specularClosure + emissionClosure) * opacity); - - if(isconnected(Next_Layer)) - { - Out_Ci = Next_Layer * refractionFilter + Out_Ci; - } else { - Out_Ci = Out_Ci + (refractionClosure*opacity) + transparencyClosure; - } - } - - Ci = Out_Ci; - -} - - diff --git a/testsuite/render-microfacet/ref/out-icx-alt.exr b/testsuite/render-microfacet/ref/out-icx-alt.exr index 043c7a3a80..8234516bb4 100644 Binary files a/testsuite/render-microfacet/ref/out-icx-alt.exr and b/testsuite/render-microfacet/ref/out-icx-alt.exr differ diff --git a/testsuite/render-microfacet/ref/out-linux-alt.exr b/testsuite/render-microfacet/ref/out-linux-alt.exr index 9f7e5bd1a7..fdd9f4c8aa 100644 Binary files a/testsuite/render-microfacet/ref/out-linux-alt.exr and b/testsuite/render-microfacet/ref/out-linux-alt.exr differ diff --git a/testsuite/render-microfacet/ref/out-linux-intel-alt.exr b/testsuite/render-microfacet/ref/out-linux-intel-alt.exr deleted file mode 100644 index af0192aede..0000000000 Binary files a/testsuite/render-microfacet/ref/out-linux-intel-alt.exr and /dev/null differ diff --git a/testsuite/render-microfacet/ref/out-linux2-alt.exr b/testsuite/render-microfacet/ref/out-linux2-alt.exr deleted file mode 100644 index e1b07b6e95..0000000000 Binary files a/testsuite/render-microfacet/ref/out-linux2-alt.exr and /dev/null differ diff --git a/testsuite/render-microfacet/ref/out-macos-alt.exr b/testsuite/render-microfacet/ref/out-macos-alt.exr deleted file mode 100644 index 4458ee811c..0000000000 Binary files a/testsuite/render-microfacet/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-microfacet/ref/out-macos-arm-debug-alt.exr b/testsuite/render-microfacet/ref/out-macos-arm-debug-alt.exr deleted file mode 100644 index 765909fd12..0000000000 Binary files a/testsuite/render-microfacet/ref/out-macos-arm-debug-alt.exr and /dev/null differ diff --git a/testsuite/render-microfacet/ref/out-macos-arm-strict-alt.exr b/testsuite/render-microfacet/ref/out-macos-arm-strict-alt.exr deleted file mode 100644 index 3be89021d2..0000000000 Binary files a/testsuite/render-microfacet/ref/out-macos-arm-strict-alt.exr and /dev/null differ diff --git a/testsuite/render-microfacet/ref/out-optix-alt.exr b/testsuite/render-microfacet/ref/out-optix-alt.exr index d8f25dda6f..d788d9a597 100644 Binary files a/testsuite/render-microfacet/ref/out-optix-alt.exr and b/testsuite/render-microfacet/ref/out-optix-alt.exr differ diff --git a/testsuite/render-microfacet/ref/out-optix-alt2.exr b/testsuite/render-microfacet/ref/out-optix-alt2.exr index ea521bf3dd..d788d9a597 100644 Binary files a/testsuite/render-microfacet/ref/out-optix-alt2.exr and b/testsuite/render-microfacet/ref/out-optix-alt2.exr differ diff --git a/testsuite/render-microfacet/ref/out.exr b/testsuite/render-microfacet/ref/out.exr index 6ec04c00d9..71531a50e4 100644 Binary files a/testsuite/render-microfacet/ref/out.exr and b/testsuite/render-microfacet/ref/out.exr differ diff --git a/testsuite/render-microfacet/run.py b/testsuite/render-microfacet/run.py index b1a371a65c..126fedca57 100755 --- a/testsuite/render-microfacet/run.py +++ b/testsuite/render-microfacet/run.py @@ -11,4 +11,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 8 scene.xml out.exr") +command = testrender("-r 160 120 -aa 8 scene.xml out.exr") diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out-linux-alt.exr b/testsuite/render-mx-anisotropic-vdf/ref/out-linux-alt.exr deleted file mode 100644 index 49c96e913c..0000000000 Binary files a/testsuite/render-mx-anisotropic-vdf/ref/out-linux-alt.exr and /dev/null differ diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr b/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr index 6a3696c724..a994301cc6 100644 Binary files a/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr and b/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr differ diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out.exr b/testsuite/render-mx-anisotropic-vdf/ref/out.exr index fe02bdbcab..4c7c8cae3f 100644 Binary files a/testsuite/render-mx-anisotropic-vdf/ref/out.exr and b/testsuite/render-mx-anisotropic-vdf/ref/out.exr differ diff --git a/testsuite/render-mx-anisotropic-vdf/run.py b/testsuite/render-mx-anisotropic-vdf/run.py index 5e7dd61fab..0e146e139b 100755 --- a/testsuite/render-mx-anisotropic-vdf/run.py +++ b/testsuite/render-mx-anisotropic-vdf/run.py @@ -9,4 +9,4 @@ allowfailures = 5 outputs = [ "out.exr" ] -command = testrender("-v -r 196 196 -aa 32 scene.xml out.exr") +command = testrender("-v -r 98 98 -aa 32 scene.xml out.exr") diff --git a/testsuite/render-mx-burley-diffuse/ref/out-alt-optix.exr b/testsuite/render-mx-burley-diffuse/ref/out-alt-optix.exr index bcebad3979..b7a3120ccd 100644 Binary files a/testsuite/render-mx-burley-diffuse/ref/out-alt-optix.exr and b/testsuite/render-mx-burley-diffuse/ref/out-alt-optix.exr differ diff --git a/testsuite/render-mx-burley-diffuse/ref/out.exr b/testsuite/render-mx-burley-diffuse/ref/out.exr index 76acc65acb..d6eb568ca6 100644 Binary files a/testsuite/render-mx-burley-diffuse/ref/out.exr and b/testsuite/render-mx-burley-diffuse/ref/out.exr differ diff --git a/testsuite/render-mx-burley-diffuse/run.py b/testsuite/render-mx-burley-diffuse/run.py index f7cebc0bca..b47eaa78f9 100755 --- a/testsuite/render-mx-burley-diffuse/run.py +++ b/testsuite/render-mx-burley-diffuse/run.py @@ -9,4 +9,4 @@ hardfail = 0.05 outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 8 scene.xml out.exr") +command = testrender("-r 160 120 -aa 8 scene.xml out.exr") diff --git a/testsuite/render-mx-conductor/ref/out-optix.exr b/testsuite/render-mx-conductor/ref/out-optix.exr index f0895ee82a..3f17d6cdef 100644 Binary files a/testsuite/render-mx-conductor/ref/out-optix.exr and b/testsuite/render-mx-conductor/ref/out-optix.exr differ diff --git a/testsuite/render-mx-conductor/ref/out.exr b/testsuite/render-mx-conductor/ref/out.exr index 5fcf988d8a..c236e0884a 100644 Binary files a/testsuite/render-mx-conductor/ref/out.exr and b/testsuite/render-mx-conductor/ref/out.exr differ diff --git a/testsuite/render-mx-conductor/run.py b/testsuite/render-mx-conductor/run.py index ba901ef836..6a6e82f3f6 100755 --- a/testsuite/render-mx-conductor/run.py +++ b/testsuite/render-mx-conductor/run.py @@ -11,4 +11,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-v -r 320 240 -aa 16 scene.xml out.exr") +command = testrender("-v -r 160 120 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-dielectric-glass/ref/out-optix-alt.exr b/testsuite/render-mx-dielectric-glass/ref/out-optix-alt.exr index 4628e6a000..0e71421aa4 100644 Binary files a/testsuite/render-mx-dielectric-glass/ref/out-optix-alt.exr and b/testsuite/render-mx-dielectric-glass/ref/out-optix-alt.exr differ diff --git a/testsuite/render-mx-dielectric-glass/ref/out.exr b/testsuite/render-mx-dielectric-glass/ref/out.exr index 4986dd85bc..df98392dbe 100644 Binary files a/testsuite/render-mx-dielectric-glass/ref/out.exr and b/testsuite/render-mx-dielectric-glass/ref/out.exr differ diff --git a/testsuite/render-mx-dielectric-glass/run.py b/testsuite/render-mx-dielectric-glass/run.py index 6a73679929..44f52c74b6 100755 --- a/testsuite/render-mx-dielectric-glass/run.py +++ b/testsuite/render-mx-dielectric-glass/run.py @@ -10,4 +10,4 @@ allowfailures = 15 idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-v -r 320 240 -aa 16 scene.xml out.exr") +command = testrender("-v -r 160 120 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-dielectric/ref/out-optix-alt.exr b/testsuite/render-mx-dielectric/ref/out-optix-alt.exr index f1c5740e04..991f689907 100644 Binary files a/testsuite/render-mx-dielectric/ref/out-optix-alt.exr and b/testsuite/render-mx-dielectric/ref/out-optix-alt.exr differ diff --git a/testsuite/render-mx-dielectric/ref/out.exr b/testsuite/render-mx-dielectric/ref/out.exr index 92477b27b6..741c54cfdb 100644 Binary files a/testsuite/render-mx-dielectric/ref/out.exr and b/testsuite/render-mx-dielectric/ref/out.exr differ diff --git a/testsuite/render-mx-dielectric/run.py b/testsuite/render-mx-dielectric/run.py index 41de550ac3..6515e784ef 100755 --- a/testsuite/render-mx-dielectric/run.py +++ b/testsuite/render-mx-dielectric/run.py @@ -8,4 +8,4 @@ hardfail = 0.05 failpercent = 1 outputs = [ "out.exr" ] -command = testrender("-v -r 320 240 -aa 16 scene.xml out.exr") +command = testrender("-v -r 160 120 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-furnace-burley-diffuse/ref/out.exr b/testsuite/render-mx-furnace-burley-diffuse/ref/out.exr index f8483ad75f..4a8d9a7d44 100644 Binary files a/testsuite/render-mx-furnace-burley-diffuse/ref/out.exr and b/testsuite/render-mx-furnace-burley-diffuse/ref/out.exr differ diff --git a/testsuite/render-mx-furnace-burley-diffuse/run.py b/testsuite/render-mx-furnace-burley-diffuse/run.py index c70ba60c2d..20b4b6cf40 100755 --- a/testsuite/render-mx-furnace-burley-diffuse/run.py +++ b/testsuite/render-mx-furnace-burley-diffuse/run.py @@ -7,4 +7,4 @@ failthresh = 0.03 # allow a little more LSB noise between platforms hardfail = 0.03 outputs = [ "out.exr" ] -command = testrender("-r 768 128 -aa 16 scene.xml out.exr") +command = testrender("-r 384 64 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-furnace-oren-nayar/ref/out.exr b/testsuite/render-mx-furnace-oren-nayar/ref/out.exr index c4fdef2952..e136e54e91 100644 Binary files a/testsuite/render-mx-furnace-oren-nayar/ref/out.exr and b/testsuite/render-mx-furnace-oren-nayar/ref/out.exr differ diff --git a/testsuite/render-mx-furnace-oren-nayar/run.py b/testsuite/render-mx-furnace-oren-nayar/run.py index fad53f04dc..5ca5b6351d 100755 --- a/testsuite/render-mx-furnace-oren-nayar/run.py +++ b/testsuite/render-mx-furnace-oren-nayar/run.py @@ -7,4 +7,4 @@ failthresh = 0.03 # allow a little more LSB noise between platforms hardfail = 0.05 outputs = [ "out.exr" ] -command = testrender("-r 768 128 -aa 16 scene.xml out.exr") +command = testrender("-r 384 64 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-furnace-sheen/ref/out-alt-optix.exr b/testsuite/render-mx-furnace-sheen/ref/out-alt-optix.exr index 8bf2caa064..a36a9c5c2b 100644 Binary files a/testsuite/render-mx-furnace-sheen/ref/out-alt-optix.exr and b/testsuite/render-mx-furnace-sheen/ref/out-alt-optix.exr differ diff --git a/testsuite/render-mx-furnace-sheen/ref/out.exr b/testsuite/render-mx-furnace-sheen/ref/out.exr index 43c2347855..6c6bbd2bd7 100644 Binary files a/testsuite/render-mx-furnace-sheen/ref/out.exr and b/testsuite/render-mx-furnace-sheen/ref/out.exr differ diff --git a/testsuite/render-mx-furnace-sheen/run.py b/testsuite/render-mx-furnace-sheen/run.py index 3e4d213a79..b905129f7c 100755 --- a/testsuite/render-mx-furnace-sheen/run.py +++ b/testsuite/render-mx-furnace-sheen/run.py @@ -7,4 +7,4 @@ failthresh = 0.01 # allow a little more LSB noise between platforms hardfail = 0.025 outputs = [ "out.exr" ] -command = testrender("-r 768 128 -aa 16 scene.xml out.exr") +command = testrender("-r 384 64 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-generalized-schlick-glass/ref/out.exr b/testsuite/render-mx-generalized-schlick-glass/ref/out.exr index 9ccea2bff1..ed6986cb40 100644 Binary files a/testsuite/render-mx-generalized-schlick-glass/ref/out.exr and b/testsuite/render-mx-generalized-schlick-glass/ref/out.exr differ diff --git a/testsuite/render-mx-generalized-schlick-glass/run.py b/testsuite/render-mx-generalized-schlick-glass/run.py index 71a1097ba4..d61f36339c 100755 --- a/testsuite/render-mx-generalized-schlick-glass/run.py +++ b/testsuite/render-mx-generalized-schlick-glass/run.py @@ -9,4 +9,4 @@ hardfail = 0.35 outputs = [ "out.exr" ] -command = testrender("-v -r 320 240 -aa 16 scene.xml out.exr") +command = testrender("-v -r 160 120 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-generalized-schlick/ref/out-alt-optix.exr b/testsuite/render-mx-generalized-schlick/ref/out-alt-optix.exr index 55e2b38812..5daf4ec9b7 100644 Binary files a/testsuite/render-mx-generalized-schlick/ref/out-alt-optix.exr and b/testsuite/render-mx-generalized-schlick/ref/out-alt-optix.exr differ diff --git a/testsuite/render-mx-generalized-schlick/ref/out.exr b/testsuite/render-mx-generalized-schlick/ref/out.exr index c84690ca4f..abe559b199 100644 Binary files a/testsuite/render-mx-generalized-schlick/ref/out.exr and b/testsuite/render-mx-generalized-schlick/ref/out.exr differ diff --git a/testsuite/render-mx-generalized-schlick/run.py b/testsuite/render-mx-generalized-schlick/run.py index b0b461a703..90cbf65c40 100755 --- a/testsuite/render-mx-generalized-schlick/run.py +++ b/testsuite/render-mx-generalized-schlick/run.py @@ -11,4 +11,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-v -r 320 240 -aa 16 scene.xml out.exr") +command = testrender("-v -r 160 120 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-layer/ref/out-alt-optix.exr b/testsuite/render-mx-layer/ref/out-alt-optix.exr index f8437a8403..21a8e96b21 100644 Binary files a/testsuite/render-mx-layer/ref/out-alt-optix.exr and b/testsuite/render-mx-layer/ref/out-alt-optix.exr differ diff --git a/testsuite/render-mx-layer/ref/out.exr b/testsuite/render-mx-layer/ref/out.exr index 1cd9ec00f3..c0da0c015e 100644 Binary files a/testsuite/render-mx-layer/ref/out.exr and b/testsuite/render-mx-layer/ref/out.exr differ diff --git a/testsuite/render-mx-layer/run.py b/testsuite/render-mx-layer/run.py index 9da9448e97..5e7591b978 100755 --- a/testsuite/render-mx-layer/run.py +++ b/testsuite/render-mx-layer/run.py @@ -9,4 +9,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 6 scene.xml out.exr") +command = testrender("-r 160 120 -aa 6 scene.xml out.exr") diff --git a/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr b/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr index 575d493c9d..b4123b3199 100644 Binary files a/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr and b/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr differ diff --git a/testsuite/render-mx-medium-vdf-glass/ref/out.exr b/testsuite/render-mx-medium-vdf-glass/ref/out.exr index 8c1d565f66..4cf9205ce1 100644 Binary files a/testsuite/render-mx-medium-vdf-glass/ref/out.exr and b/testsuite/render-mx-medium-vdf-glass/ref/out.exr differ diff --git a/testsuite/render-mx-medium-vdf-glass/run.py b/testsuite/render-mx-medium-vdf-glass/run.py index 53348ddd13..97ccec8b4f 100755 --- a/testsuite/render-mx-medium-vdf-glass/run.py +++ b/testsuite/render-mx-medium-vdf-glass/run.py @@ -9,4 +9,4 @@ allowfailures = 5 outputs = [ "out.exr" ] -command = testrender("-r 196 196 -aa 16 scene.xml out.exr") +command = testrender("-r 98 98 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-medium-vdf/ref/out-linux-alt.exr b/testsuite/render-mx-medium-vdf/ref/out-linux-alt.exr deleted file mode 100644 index e49c557f80..0000000000 Binary files a/testsuite/render-mx-medium-vdf/ref/out-linux-alt.exr and /dev/null differ diff --git a/testsuite/render-mx-medium-vdf/ref/out.exr b/testsuite/render-mx-medium-vdf/ref/out.exr index 397560eb1d..df89a77311 100644 Binary files a/testsuite/render-mx-medium-vdf/ref/out.exr and b/testsuite/render-mx-medium-vdf/ref/out.exr differ diff --git a/testsuite/render-mx-medium-vdf/run.py b/testsuite/render-mx-medium-vdf/run.py index 99bddf1de6..37b6c2686a 100755 --- a/testsuite/render-mx-medium-vdf/run.py +++ b/testsuite/render-mx-medium-vdf/run.py @@ -8,4 +8,4 @@ failpercent = 1 outputs = [ "out.exr" ] -command = testrender("-v -r 196 196 -aa 32 scene.xml out.exr") +command = testrender("-v -r 98 98 -aa 32 scene.xml out.exr") diff --git a/testsuite/render-mx-sheen/ref/out-alt-optix.exr b/testsuite/render-mx-sheen/ref/out-alt-optix.exr index 181cb411d2..9c1aa46621 100644 Binary files a/testsuite/render-mx-sheen/ref/out-alt-optix.exr and b/testsuite/render-mx-sheen/ref/out-alt-optix.exr differ diff --git a/testsuite/render-mx-sheen/ref/out.exr b/testsuite/render-mx-sheen/ref/out.exr index f85869429b..1d5bf051e2 100644 Binary files a/testsuite/render-mx-sheen/ref/out.exr and b/testsuite/render-mx-sheen/ref/out.exr differ diff --git a/testsuite/render-mx-sheen/run.py b/testsuite/render-mx-sheen/run.py index 62f9b4aae7..3e1d407ef9 100755 --- a/testsuite/render-mx-sheen/run.py +++ b/testsuite/render-mx-sheen/run.py @@ -10,4 +10,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 6 scene.xml out.exr") +command = testrender("-r 160 120 -aa 6 scene.xml out.exr") diff --git a/testsuite/render-oren-nayar/ref/out.exr b/testsuite/render-oren-nayar/ref/out.exr index 9873d3471d..042fc01fa1 100644 Binary files a/testsuite/render-oren-nayar/ref/out.exr and b/testsuite/render-oren-nayar/ref/out.exr differ diff --git a/testsuite/render-oren-nayar/run.py b/testsuite/render-oren-nayar/run.py index 7c25587c9c..430d6fcaea 100755 --- a/testsuite/render-oren-nayar/run.py +++ b/testsuite/render-oren-nayar/run.py @@ -9,4 +9,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 4 scene.xml out.exr") +command = testrender("-r 160 120 -aa 4 scene.xml out.exr") diff --git a/testsuite/render-raytypes/ref/out-macos-alt.exr b/testsuite/render-raytypes/ref/out-macos-alt.exr deleted file mode 100644 index 997991f354..0000000000 Binary files a/testsuite/render-raytypes/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-raytypes/ref/out-optix-alt.exr b/testsuite/render-raytypes/ref/out-optix-alt.exr index 876a04d2ac..e0fd221c3e 100644 Binary files a/testsuite/render-raytypes/ref/out-optix-alt.exr and b/testsuite/render-raytypes/ref/out-optix-alt.exr differ diff --git a/testsuite/render-raytypes/ref/out-optix-alt2.exr b/testsuite/render-raytypes/ref/out-optix-alt2.exr new file mode 100644 index 0000000000..6f78191fbc Binary files /dev/null and b/testsuite/render-raytypes/ref/out-optix-alt2.exr differ diff --git a/testsuite/render-raytypes/ref/out.exr b/testsuite/render-raytypes/ref/out.exr index 3a562ef1a9..ba0f238e6f 100644 Binary files a/testsuite/render-raytypes/ref/out.exr and b/testsuite/render-raytypes/ref/out.exr differ diff --git a/testsuite/render-raytypes/run.py b/testsuite/render-raytypes/run.py index 281031db6a..cd60698031 100755 --- a/testsuite/render-raytypes/run.py +++ b/testsuite/render-raytypes/run.py @@ -14,4 +14,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-v -r 100 75 -aa 2 scene.xml out.exr") +command = testrender("-v -r 50 38 -aa 2 scene.xml out.exr") diff --git a/testsuite/render-spi-thinlayer/ref/out-icx-alt.exr b/testsuite/render-spi-thinlayer/ref/out-icx-alt.exr index 74052b2074..c3a57a067c 100644 Binary files a/testsuite/render-spi-thinlayer/ref/out-icx-alt.exr and b/testsuite/render-spi-thinlayer/ref/out-icx-alt.exr differ diff --git a/testsuite/render-spi-thinlayer/ref/out-macos-alt.exr b/testsuite/render-spi-thinlayer/ref/out-macos-alt.exr index 21121f391f..bfb29e4566 100644 Binary files a/testsuite/render-spi-thinlayer/ref/out-macos-alt.exr and b/testsuite/render-spi-thinlayer/ref/out-macos-alt.exr differ diff --git a/testsuite/render-spi-thinlayer/ref/out-optix-alt.exr b/testsuite/render-spi-thinlayer/ref/out-optix-alt.exr index 925d8a4e5b..f6bf2fae7a 100644 Binary files a/testsuite/render-spi-thinlayer/ref/out-optix-alt.exr and b/testsuite/render-spi-thinlayer/ref/out-optix-alt.exr differ diff --git a/testsuite/render-spi-thinlayer/ref/out.exr b/testsuite/render-spi-thinlayer/ref/out.exr index 556fee7ab2..c501f9a123 100644 Binary files a/testsuite/render-spi-thinlayer/ref/out.exr and b/testsuite/render-spi-thinlayer/ref/out.exr differ diff --git a/testsuite/render-spi-thinlayer/run.py b/testsuite/render-spi-thinlayer/run.py index f46b389e36..fee79023ea 100755 --- a/testsuite/render-spi-thinlayer/run.py +++ b/testsuite/render-spi-thinlayer/run.py @@ -11,4 +11,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 16 scene.xml out.exr") +command = testrender("-r 160 120 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-uv/ref/out-optix-alt.exr b/testsuite/render-uv/ref/out-optix-alt.exr index 90f5567ee7..fd75835d65 100644 Binary files a/testsuite/render-uv/ref/out-optix-alt.exr and b/testsuite/render-uv/ref/out-optix-alt.exr differ diff --git a/testsuite/render-uv/ref/out.exr b/testsuite/render-uv/ref/out.exr index 72c82ae5c4..40c56b635c 100644 Binary files a/testsuite/render-uv/ref/out.exr and b/testsuite/render-uv/ref/out.exr differ diff --git a/testsuite/render-uv/run.py b/testsuite/render-uv/run.py index 0af3895ea8..b7061bba1a 100755 --- a/testsuite/render-uv/run.py +++ b/testsuite/render-uv/run.py @@ -10,4 +10,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 16 scene.xml out.exr") +command = testrender("-r 160 120 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-veachmis/ref/out-macos-alt.exr b/testsuite/render-veachmis/ref/out-macos-alt.exr deleted file mode 100644 index 391100a809..0000000000 Binary files a/testsuite/render-veachmis/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-veachmis/ref/out-optix-alt.exr b/testsuite/render-veachmis/ref/out-optix-alt.exr index 120ee76a7b..46c1eb238d 100644 Binary files a/testsuite/render-veachmis/ref/out-optix-alt.exr and b/testsuite/render-veachmis/ref/out-optix-alt.exr differ diff --git a/testsuite/render-veachmis/ref/out-optix-alt2.exr b/testsuite/render-veachmis/ref/out-optix-alt2.exr new file mode 100644 index 0000000000..8ac0adcb13 Binary files /dev/null and b/testsuite/render-veachmis/ref/out-optix-alt2.exr differ diff --git a/testsuite/render-veachmis/ref/out.exr b/testsuite/render-veachmis/ref/out.exr index 797731976a..68f06743a3 100644 Binary files a/testsuite/render-veachmis/ref/out.exr and b/testsuite/render-veachmis/ref/out.exr differ diff --git a/testsuite/render-veachmis/run.py b/testsuite/render-veachmis/run.py index 0f2a25d8cb..c760b96961 100755 --- a/testsuite/render-veachmis/run.py +++ b/testsuite/render-veachmis/run.py @@ -5,4 +5,4 @@ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 16 veach.xml out.exr") +command = testrender("-r 160 120 -aa 16 veach.xml out.exr") diff --git a/testsuite/render-ward/ref/out-optix-alt.exr b/testsuite/render-ward/ref/out-optix-alt.exr index 97a08c9d91..55dbf7a19e 100644 Binary files a/testsuite/render-ward/ref/out-optix-alt.exr and b/testsuite/render-ward/ref/out-optix-alt.exr differ diff --git a/testsuite/render-ward/ref/out.exr b/testsuite/render-ward/ref/out.exr index 20f6255a0f..c5b84e564e 100644 Binary files a/testsuite/render-ward/ref/out.exr and b/testsuite/render-ward/ref/out.exr differ diff --git a/testsuite/render-ward/run.py b/testsuite/render-ward/run.py index 75eaea3d3a..b2ed621ddb 100755 --- a/testsuite/render-ward/run.py +++ b/testsuite/render-ward/run.py @@ -10,4 +10,4 @@ idiff_program = "idiff" outputs = [ "out.exr" ] -command = testrender("-r 320 240 -aa 4 scene.xml out.exr") +command = testrender("-r 160 120 -aa 4 scene.xml out.exr")