Skip to content

Commit

Permalink
git subrepo pull --branch=master src/Ray
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "src/Ray"
  merged:   "7550dd99e"
upstream:
  origin:   "Ray"
  branch:   "master"
  commit:   "7550dd99e"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
  • Loading branch information
sergcpp committed Nov 18, 2024
1 parent a0e2353 commit 5c40d41
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Ray/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = Ray
branch = master
commit = 11c1698e55a16f30f50a66d5d6226c17d5e2fda2
parent = 61419f650abfdc36a3a4a6ad1f4d3ae838b9c651
commit = 7550dd99e8b70ab0f8eeac5e7d14627c66c052bb
parent = a0e2353fe56fea7e3f0e3353b0786cf50a6dc4c2
method = merge
cmdver = 0.4.6
2 changes: 2 additions & 0 deletions src/Ray/internal/CoreSIMD.h
Original file line number Diff line number Diff line change
Expand Up @@ -4082,6 +4082,7 @@ bool Ray::NS::Traverse_BLAS_WithStack_ClosestHit(const float ro[3], const float
tri_end = int(tri_start + nodes[cur.index].child[1]);
assert((tri_start % 8) == 0);
assert((tri_end - tri_start) <= 8);
unused(tri_end);
res |=
IntersectTri<S>(ro, rd, mtris[tri_start / 8], tri_start, inter_prim_index, inter_t, inter_u, inter_v);
}
Expand Down Expand Up @@ -4239,6 +4240,7 @@ int Ray::NS::Traverse_BLAS_WithStack_AnyHit(const float ro[3], const float rd[3]
tri_end = int(tri_start + nodes[cur.index].child[1]);
assert((tri_start % 8) == 0);
assert((tri_end - tri_start) <= 8);
unused(tri_end);
const bool hit_found =
IntersectTri<S>(ro, rd, mtris[tri_start / 8], tri_start, inter_prim_index, inter_t, inter_u, inter_v);
if (hit_found) {
Expand Down
2 changes: 1 addition & 1 deletion src/Ray/internal/RendererGPU.h
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ class Renderer : public RendererBase {
raw_filtered_buf_.resource_state = eResState(state);
}

void set_command_buffer(const GpuCommandBuffer cmd_buf) {
void set_command_buffer(const GpuCommandBuffer cmd_buf) override {
external_cmd_buf_ = cmd_buf;
ctx_->frame_cpu_synced[cmd_buf.index] = false;
}
Expand Down

0 comments on commit 5c40d41

Please sign in to comment.