Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +20 -14
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ee0bf671e - Show all commits

34
intern/cycles/kernel/device/cpu/bvh.h
View File

@ -22,6 +22,12 @@
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
#if INTEGRATOR_SHADOW_ISECT_SIZE < 256
using numhit_t = uint8_t;
#else
using numhit_t = uint32_t;
#endif
#define EMBREE_IS_HAIR(x) (x & 1) #define EMBREE_IS_HAIR(x) (x & 1)
/* Intersection context. */ /* Intersection context. */
@ -43,9 +49,9 @@ struct CCLIntersectContext {
/* for shadow rays */ /* for shadow rays */
IntegratorShadowState isect_s; IntegratorShadowState isect_s;
uint max_hits; numhit_t max_hits;
uint num_hits; numhit_t num_hits;
uint num_recorded_hits; numhit_t num_recorded_hits;
float throughput; float throughput;
bool opaque_hit; bool opaque_hit;
@ -62,9 +68,9 @@ struct CCLIntersectContext {
kg = kg_; kg = kg_;
type = type_; type = type_;
ray = NULL; ray = NULL;
max_hits = 1; max_hits = numhit_t(1);
num_hits = 0; num_hits = numhit_t(0);
num_recorded_hits = 0; num_recorded_hits = numhit_t(0);
throughput = 1.0f; throughput = 1.0f;
opaque_hit = false; opaque_hit = false;
isect_s = NULL; isect_s = NULL;
@ -265,17 +271,17 @@ ccl_device void kernel_embree_filter_occluded_func(const RTCFilterFunctionNArgum
} }
/* Test if we need to record this transparent intersection. */ /* Test if we need to record this transparent intersection. */
const uint max_record_hits = min(ctx->max_hits, INTEGRATOR_SHADOW_ISECT_SIZE); const numhit_t max_record_hits = min(ctx->max_hits, INTEGRATOR_SHADOW_ISECT_SIZE);
if (ctx->num_recorded_hits < max_record_hits) { if (ctx->num_recorded_hits < max_record_hits) {
/* If maximum number of hits was reached, replace the intersection with the /* If maximum number of hits was reached, replace the intersection with the
* highest distance. We want to find the N closest intersections. */ * highest distance. We want to find the N closest intersections. */
const uint num_recorded_hits = min(ctx->num_recorded_hits, max_record_hits); const numhit_t num_recorded_hits = min(ctx->num_recorded_hits, max_record_hits);
uint isect_index = num_recorded_hits; numhit_t isect_index = num_recorded_hits;
if (num_recorded_hits + 1 >= max_record_hits) { if (num_recorded_hits + 1 >= max_record_hits) {
float max_t = INTEGRATOR_STATE_ARRAY(ctx->isect_s, shadow_isect, 0, t); float max_t = INTEGRATOR_STATE_ARRAY(ctx->isect_s, shadow_isect, 0, t);
uint max_recorded_hit = 0; numhit_t max_recorded_hit = numhit_t(0);
for (uint i = 1; i < num_recorded_hits; ++i) { for (numhit_t i = numhit_t(1); i < num_recorded_hits; ++i) {
const float isect_t = INTEGRATOR_STATE_ARRAY(ctx->isect_s, shadow_isect, i, t); const float isect_t = INTEGRATOR_STATE_ARRAY(ctx->isect_s, shadow_isect, i, t);
if (isect_t > max_t) { if (isect_t > max_t) {
max_recorded_hit = i; max_recorded_hit = i;
@ -552,7 +558,7 @@ ccl_device_intersect bool kernel_embree_intersect_shadow_all(KernelGlobals kg,
{ {
CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_SHADOW_ALL); CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_SHADOW_ALL);
ctx.isect_s = state; ctx.isect_s = state;
ctx.max_hits = max_hits; ctx.max_hits = numhit_t(max_hits);
ctx.ray = ray; ctx.ray = ray;
IntersectContext rtc_ctx(&ctx); IntersectContext rtc_ctx(&ctx);
RTCRay rtc_ray; RTCRay rtc_ray;
@ -574,8 +580,8 @@ ccl_device_intersect uint kernel_embree_intersect_volume(KernelGlobals kg,
{ {
CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_VOLUME_ALL); CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_VOLUME_ALL);
ctx.vol_isect = isect; ctx.vol_isect = isect;
ctx.max_hits = max_hits; ctx.max_hits = numhit_t(max_hits);
ctx.num_hits = 0; ctx.num_hits = numhit_t(0);
ctx.ray = ray; ctx.ray = ray;
IntersectContext rtc_ctx(&ctx); IntersectContext rtc_ctx(&ctx);
RTCRay rtc_ray; RTCRay rtc_ray;