Skip to content

Commit 804278f

Browse files
committed
Fixed things pointed out in comments in PR32
1 parent 7cc4679 commit 804278f

File tree

9 files changed

+299
-303
lines changed

9 files changed

+299
-303
lines changed

examples_tests/18.MitsubaLoader/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ vec2 SampleSphericalMap(in vec3 v)
5454
return uv;
5555
}
5656
57-
vec3 nbl_computeLighting(inout nbl_glsl_IsotropicViewSurfaceInteraction out_interaction, in mat2 dUV, in MC_precomputed_t precomp)
57+
vec3 nbl_computeLighting(inout nbl_glsl_IsotropicViewSurfaceInteraction out_interaction, in mat2 dUV, in nbl_glsl_MC_precomputed_t precomp)
5858
{
5959
nbl_glsl_xoroshiro64star_state_t scramble_start_state = textureLod(scramblebuf,gl_FragCoord.xy/VIEWPORT_SZ,0).rg;
6060
@@ -63,16 +63,16 @@ vec3 nbl_computeLighting(inout nbl_glsl_IsotropicViewSurfaceInteraction out_inte
6363
vec3 color = vec3(0.0);
6464
6565
#ifdef USE_ENVMAP
66-
instr_stream_t gcs = getGenChoiceStream(precomp);
67-
instr_stream_t rnps = getRemAndPdfStream(precomp);
66+
nbl_glsl_instr_stream_t gcs = getGenChoiceStream(precomp);
67+
nbl_glsl_instr_stream_t rnps = getRemAndPdfStream(precomp);
6868
for (int i = 0; i < SAMPLE_COUNT; ++i)
6969
{
7070
nbl_glsl_xoroshiro64star_state_t scramble_state = scramble_start_state;
7171
7272
vec3 rand = rand3d(i,scramble_state);
7373
float pdf;
7474
nbl_glsl_LightSample s;
75-
vec3 rem = runGenerateAndRemainderStream(precomp, gcs, rnps, rand, pdf, s);
75+
vec3 rem = nbl_glsl_runGenerateAndRemainderStream(precomp, gcs, rnps, rand, pdf, s);
7676
7777
vec2 uv = SampleSphericalMap(s.L);
7878
color += rem*textureLod(envMap, uv, 0.0).xyz;

0 commit comments

Comments
 (0)