diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-09-28 14:25:12 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-09-28 14:25:12 +0400 |
| commit | 82198721d6996d03df5d384fde2c155e998bc56e (patch) | |
| tree | d7ef1de651207fb3d3d69f18046eef2259a855dc /source/blender/render/intern | |
| parent | 1305715d2d84f67027b870f263cef3a7f009c056 (diff) | |
Raycounters fix
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/include/raycounter.h | 11 | ||||
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject.cpp | 3 | ||||
| -rw-r--r-- | source/blender/render/intern/source/shadeinput.c | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/source/blender/render/intern/include/raycounter.h b/source/blender/render/intern/include/raycounter.h index 06579b366ee..dea6d63d001 100644 --- a/source/blender/render/intern/include/raycounter.h +++ b/source/blender/render/intern/include/raycounter.h @@ -34,17 +34,6 @@ #ifdef RE_RAYCOUNTER -typedef struct RayCounter RayCounter; -struct RayCounter -{ - - struct - { - unsigned long long test, hit; - - } faces, bb, simd_bb, raycast, raytrace_hint, rayshadow_last_hit; -}; - /* #define RE_RC_INIT(isec, shi) (isec).count = re_rc_counter+(shi).thread */ #define RE_RC_INIT(isec, shi) (isec).raycounter = &((shi).raycounter) void RE_RC_INFO (RayCounter *rc); diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index dc5128b2d1f..c32f61e8f0a 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -189,6 +189,7 @@ static int intersect_rayface(RayObject *hit_obj, RayFace *face, Isect *is) if(is->orig.ob == face->ob && is->orig.face == face->face) return 0; +/* if(is->skip & RE_SKIP_VLR_RENDER_CHECK) { if(vlr_check_intersect(is, (ObjectInstanceRen*)face->ob, (VlakRen*)face->face ) == 0) @@ -204,7 +205,7 @@ static int intersect_rayface(RayObject *hit_obj, RayFace *face, Isect *is) if(rayface_check_cullface(face, is) == 0) return 0; } - +*/ RE_RC_COUNT(is->raycounter->faces.test); //Load coords diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index 0d3c5772d8a..e5684e2ebe9 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -243,9 +243,9 @@ void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr) shr->rayhits[1] = (float)shi->raycounter.bb.hit; shr->rayhits[2] = 0.0; shr->rayhits[3] = 1.0; - RE_RC_MERGE(&re_rc_counter[shi->thread], &shi->raycounter); } */ + RE_RC_MERGE(&re_rc_counter[shi->thread], &shi->raycounter); } /* **************************************************************************** */ |