blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix T79819: crash with OSL trace() and getmessage() after Embree changes 

The return value of scene_intersect must be checked, the isect struct members
can't be assumed to be initialized if that returns false.

Differential Revision: https://developer.blender.org/D8692
This commit is contained in:
Brecht Van Lommel 2020-08-24 14:30:54 +02:00
parent 9498eb2692
commit dc74d60915
Notes: blender-bot 2023-02-14 05:53:38 +01:00 
Referenced by issue #79819, Crash with OSL shader when checking results from getmessage trace "geom:name"
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/kernel/osl/osl_globals.h
View File

@ -90,6 +90,7 @@ struct OSLTraceData {
ShaderData sd;
bool setup;
bool init;
bool hit;
};
/* thread key for thread specific data lookup */

8
intern/cycles/kernel/osl/osl_services.cpp
View File

@ -1481,6 +1481,7 @@ bool OSLRenderServices::trace(TraceOpt &options,
tracedata->ray = ray;
tracedata->setup = false;
tracedata->init = true;
tracedata->hit = false;
tracedata->sd.osl_globals = sd->osl_globals;
KernelGlobals *kg = sd->osl_globals;
@ -1492,7 +1493,8 @@ bool OSLRenderServices::trace(TraceOpt &options,
/* Raytrace, leaving out shadow opaque to avoid early exit. */
uint visibility = PATH_RAY_ALL_VISIBILITY - PATH_RAY_SHADOW_OPAQUE;
return scene_intersect(kg, &ray, visibility, &tracedata->isect);
tracedata->hit = scene_intersect(kg, &ray, visibility, &tracedata->isect);
return tracedata->hit;
}
bool OSLRenderServices::getmessage(OSL::ShaderGlobals *sg,
@ -1506,9 +1508,9 @@ bool OSLRenderServices::getmessage(OSL::ShaderGlobals *sg,
if (source == u_trace && tracedata->init) {
if (name == u_hit) {
return set_attribute_int((tracedata->isect.prim != PRIM_NONE), type, derivatives, val);
return set_attribute_int(tracedata->hit, type, derivatives, val);
}
else if (tracedata->isect.prim != PRIM_NONE) {
else if (tracedata->hit) {
if (name == u_hitdist) {
float f[3] = {tracedata->isect.t, 0.0f, 0.0f};
return set_attribute_float(f, type, derivatives, val);