diff options
| author | Yong He <yonghe@outlook.com> | 2023-12-06 12:05:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 12:05:07 -0800 |
| commit | 11111e5733b189127dc2c4934d67693b9bc6e764 (patch) | |
| tree | 0ba84df3e856eb104abec2ecac47242bc70a7b7d /tests/autodiff/material | |
| parent | fa6d8717d02912697c09f2d7de802723ac6d6e47 (diff) | |
Support visibility control and default to `internal`. (#3380)
* Support visibility control and default to `internal`.
* Fix wip.
* Fixes.
* Fix.
* Fix test.
* Add legacy language detection and compatibility for existing code.
* Add doc.
---------
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'tests/autodiff/material')
| -rw-r--r-- | tests/autodiff/material/DiffuseMaterial.slang | 8 | ||||
| -rw-r--r-- | tests/autodiff/material/DiffuseMaterialInstance.slang | 12 | ||||
| -rw-r--r-- | tests/autodiff/material/GlossyMaterial.slang | 8 | ||||
| -rw-r--r-- | tests/autodiff/material/GlossyMaterialInstance.slang | 18 | ||||
| -rw-r--r-- | tests/autodiff/material/IBSDF.slang | 4 | ||||
| -rw-r--r-- | tests/autodiff/material/IMaterial.slang | 6 | ||||
| -rw-r--r-- | tests/autodiff/material/IMaterialInstance.slang | 4 | ||||
| -rw-r--r-- | tests/autodiff/material/MaterialSystem.slang | 2 |
8 files changed, 31 insertions, 31 deletions
diff --git a/tests/autodiff/material/DiffuseMaterial.slang b/tests/autodiff/material/DiffuseMaterial.slang index e762e17c8..3dd2927f5 100644 --- a/tests/autodiff/material/DiffuseMaterial.slang +++ b/tests/autodiff/material/DiffuseMaterial.slang @@ -3,13 +3,13 @@ __exported import IMaterial; __exported import DiffuseMaterialInstance; -struct DiffuseMaterial : IMaterial +public struct DiffuseMaterial : IMaterial { - float3 baseColor; + public float3 baseColor; - typedef DiffuseMaterialInstance MaterialInstance; + public typedef DiffuseMaterialInstance MaterialInstance; - DiffuseMaterialInstance setupMaterialInstance() + public DiffuseMaterialInstance setupMaterialInstance() { DiffuseMaterialInstance mi = { {baseColor} }; return mi; diff --git a/tests/autodiff/material/DiffuseMaterialInstance.slang b/tests/autodiff/material/DiffuseMaterialInstance.slang index ca6bfc69a..c6f0e315b 100644 --- a/tests/autodiff/material/DiffuseMaterialInstance.slang +++ b/tests/autodiff/material/DiffuseMaterialInstance.slang @@ -3,23 +3,23 @@ __exported import IMaterialInstance; __exported import IBSDF; -struct DiffuseBSDF : IBSDF +public struct DiffuseBSDF : IBSDF { - float3 albedo; + public float3 albedo; [TreatAsDifferentiable] - float3 eval(const float3 wiLocal, const float3 woLocal) + public float3 eval(const float3 wiLocal, const float3 woLocal) { return albedo; } }; -struct DiffuseMaterialInstance : IMaterialInstance +public struct DiffuseMaterialInstance : IMaterialInstance { - DiffuseBSDF bsdf; + public DiffuseBSDF bsdf; [TreatAsDifferentiable] - float3 eval(const float3 wi, const float3 wo) + public float3 eval(const float3 wi, const float3 wo) { return bsdf.eval(wi, wo); } diff --git a/tests/autodiff/material/GlossyMaterial.slang b/tests/autodiff/material/GlossyMaterial.slang index 59cee5afe..9848c82ed 100644 --- a/tests/autodiff/material/GlossyMaterial.slang +++ b/tests/autodiff/material/GlossyMaterial.slang @@ -3,13 +3,13 @@ __exported import IMaterial; __exported import GlossyMaterialInstance; -struct GlossyMaterial : IMaterial +public struct GlossyMaterial : IMaterial { - float3 baseColor; + public float3 baseColor; - typedef GlossyMaterialInstance MaterialInstance; + public typedef GlossyMaterialInstance MaterialInstance; - GlossyMaterialInstance setupMaterialInstance() + public GlossyMaterialInstance setupMaterialInstance() { GlossyMaterialInstance mi = { { baseColor } }; return mi; diff --git a/tests/autodiff/material/GlossyMaterialInstance.slang b/tests/autodiff/material/GlossyMaterialInstance.slang index fbbcc1a26..fb1ce55c0 100644 --- a/tests/autodiff/material/GlossyMaterialInstance.slang +++ b/tests/autodiff/material/GlossyMaterialInstance.slang @@ -3,44 +3,44 @@ __exported import IMaterialInstance; __exported import IBSDF; -struct GlossyBSDF : IBSDF +public struct GlossyBSDF : IBSDF { - float3 albedo; + public float3 albedo; - float3 getAlbedo() + public float3 getAlbedo() { return albedo; } [ForwardDerivativeOf(getAlbedo)] [TreatAsDifferentiable] - DifferentialPair<float3> __fwd_d_getAlbedo() + public DifferentialPair<float3> __fwd_d_getAlbedo() { return diffPair(albedo, float3(1.f)); } [BackwardDerivativeOf(getAlbedo)] [TreatAsDifferentiable] - void __bwd_d_getAlbedo(float3 dOut) + public void __bwd_d_getAlbedo(float3 dOut) { [unroll] for (int j = 0; j < 3; j++) outputBuffer[j + 3] += dOut[j]; } [BackwardDifferentiable] - float3 eval(const float3 wiLocal, const float3 woLocal) + public float3 eval(const float3 wiLocal, const float3 woLocal) { float3 a = getAlbedo(); return a * a; } }; -struct GlossyMaterialInstance : IMaterialInstance +public struct GlossyMaterialInstance : IMaterialInstance { - GlossyBSDF bsdf; + public GlossyBSDF bsdf; [BackwardDifferentiable] - float3 eval(const float3 wi, const float3 wo) + public float3 eval(const float3 wi, const float3 wo) { return bsdf.eval(wi, wo); } diff --git a/tests/autodiff/material/IBSDF.slang b/tests/autodiff/material/IBSDF.slang index 9bdeb9197..933392b80 100644 --- a/tests/autodiff/material/IBSDF.slang +++ b/tests/autodiff/material/IBSDF.slang @@ -1,9 +1,9 @@ //TEST_IGNORE_FILE: //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0], stride=4):out,name=outputBuffer -RWStructuredBuffer<float> outputBuffer; +public RWStructuredBuffer<float> outputBuffer; -interface IBSDF +public interface IBSDF { [BackwardDifferentiable] float3 eval(const float3 wi, const float3 wo); diff --git a/tests/autodiff/material/IMaterial.slang b/tests/autodiff/material/IMaterial.slang index 4bdaac2bc..73390ba0e 100644 --- a/tests/autodiff/material/IMaterial.slang +++ b/tests/autodiff/material/IMaterial.slang @@ -2,9 +2,9 @@ __exported import IMaterialInstance; -interface IMaterial +public interface IMaterial { - associatedtype MaterialInstance : IMaterialInstance; + public associatedtype MaterialInstance : IMaterialInstance; - MaterialInstance setupMaterialInstance(); + public MaterialInstance setupMaterialInstance(); } diff --git a/tests/autodiff/material/IMaterialInstance.slang b/tests/autodiff/material/IMaterialInstance.slang index fb13f8982..4425c2c65 100644 --- a/tests/autodiff/material/IMaterialInstance.slang +++ b/tests/autodiff/material/IMaterialInstance.slang @@ -1,7 +1,7 @@ //TEST_IGNORE_FILE: -interface IMaterialInstance +public interface IMaterialInstance { [BackwardDifferentiable] - float3 eval(const float3 wi, const float3 wo); + public float3 eval(const float3 wi, const float3 wo); } diff --git a/tests/autodiff/material/MaterialSystem.slang b/tests/autodiff/material/MaterialSystem.slang index 5e733fad9..9fcee1386 100644 --- a/tests/autodiff/material/MaterialSystem.slang +++ b/tests/autodiff/material/MaterialSystem.slang @@ -2,7 +2,7 @@ __exported import IMaterial; -IMaterial createMaterialClassConformance(int type, float3 value) +public IMaterial createMaterialClassConformance(int type, float3 value) { return createDynamicObject<IMaterial, float3>(type, value); } |
