Skip to content

Commit 5c40d41

Browse files
committed
git subrepo pull --branch=master src/Ray
subrepo: subdir: "src/Ray" merged: "7550dd99e" upstream: origin: "Ray" branch: "master" commit: "7550dd99e" git-subrepo: version: "0.4.6" origin: "???" commit: "???"
1 parent a0e2353 commit 5c40d41

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/Ray/.gitrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = Ray
88
branch = master
9-
commit = 11c1698e55a16f30f50a66d5d6226c17d5e2fda2
10-
parent = 61419f650abfdc36a3a4a6ad1f4d3ae838b9c651
9+
commit = 7550dd99e8b70ab0f8eeac5e7d14627c66c052bb
10+
parent = a0e2353fe56fea7e3f0e3353b0786cf50a6dc4c2
1111
method = merge
1212
cmdver = 0.4.6

src/Ray/internal/CoreSIMD.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4082,6 +4082,7 @@ bool Ray::NS::Traverse_BLAS_WithStack_ClosestHit(const float ro[3], const float
40824082
tri_end = int(tri_start + nodes[cur.index].child[1]);
40834083
assert((tri_start % 8) == 0);
40844084
assert((tri_end - tri_start) <= 8);
4085+
unused(tri_end);
40854086
res |=
40864087
IntersectTri<S>(ro, rd, mtris[tri_start / 8], tri_start, inter_prim_index, inter_t, inter_u, inter_v);
40874088
}
@@ -4239,6 +4240,7 @@ int Ray::NS::Traverse_BLAS_WithStack_AnyHit(const float ro[3], const float rd[3]
42394240
tri_end = int(tri_start + nodes[cur.index].child[1]);
42404241
assert((tri_start % 8) == 0);
42414242
assert((tri_end - tri_start) <= 8);
4243+
unused(tri_end);
42424244
const bool hit_found =
42434245
IntersectTri<S>(ro, rd, mtris[tri_start / 8], tri_start, inter_prim_index, inter_t, inter_u, inter_v);
42444246
if (hit_found) {

src/Ray/internal/RendererGPU.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ class Renderer : public RendererBase {
341341
raw_filtered_buf_.resource_state = eResState(state);
342342
}
343343

344-
void set_command_buffer(const GpuCommandBuffer cmd_buf) {
344+
void set_command_buffer(const GpuCommandBuffer cmd_buf) override {
345345
external_cmd_buf_ = cmd_buf;
346346
ctx_->frame_cpu_synced[cmd_buf.index] = false;
347347
}

0 commit comments

Comments
 (0)