aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

+some changes. isolating problem

Browse Source
This commit is contained in:
Evghenii
2014-01-05 15:20:51 +01:00
parent 6c0d5a3334
commit 50e3b68586
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
examples_ptx/rt/rt.ispc
View File

@@ -38,9 +38,6 @@ typedef bool bool_t;
#endif #endif
typedef float<3> float3; typedef float<3> float3;
#if 0
#define __ORIG
#endif
struct int3 struct int3
{ {
@@ -49,11 +46,7 @@ struct int3
struct Ray { struct Ray {
float3 origin, dir, invDir; float3 origin, dir, invDir;
#ifdef __ORIG
uniform unsigned int dirIsNeg[3]; uniform unsigned int dirIsNeg[3];
#else
uniform int3 dirIsNeg;
#endif
float mint, maxt; float mint, maxt;
int hitId; int hitId;
}; };
@@ -117,15 +110,9 @@ static void generateRay(uniform const float raster2camera[4][4],
ray.invDir = 1.f / ray.dir; ray.invDir = 1.f / ray.dir;
#ifdef __ORIG
ray.dirIsNeg[0] = any(ray.invDir.x < 0) ? 1 : 0; ray.dirIsNeg[0] = any(ray.invDir.x < 0) ? 1 : 0;
ray.dirIsNeg[1] = any(ray.invDir.y < 0) ? 1 : 0; ray.dirIsNeg[1] = any(ray.invDir.y < 0) ? 1 : 0;
ray.dirIsNeg[2] = any(ray.invDir.z < 0) ? 1 : 0; ray.dirIsNeg[2] = any(ray.invDir.z < 0) ? 1 : 0;
#else
ray.dirIsNeg.x = any(ray.invDir.x < 0) ? 1 : 0;
ray.dirIsNeg.y = any(ray.invDir.y < 0) ? 1 : 0;
ray.dirIsNeg.z = any(ray.invDir.z < 0) ? 1 : 0;
#endif
} }
@@ -235,13 +222,13 @@ BVHIntersect(const uniform LinearBVHNode nodes[],
} }
else { else {
// Put far BVH node on _todo_ stack, advance to near node // Put far BVH node on _todo_ stack, advance to near node
#ifdef __ORIG #if 0 /* fails */
int dirIsNeg = r.dirIsNeg[node.splitAxis]; int dirIsNeg = r.dirIsNeg[node.splitAxis];
#else #else
int dirIsNeg; int dirIsNeg;
if (node.splitAxis == 0) dirIsNeg = r.dirIsNeg.x; if (node.splitAxis == 0) dirIsNeg = r.dirIsNeg[0];
if (node.splitAxis == 1) dirIsNeg = r.dirIsNeg.y; if (node.splitAxis == 1) dirIsNeg = r.dirIsNeg[1];
if (node.splitAxis == 2) dirIsNeg = r.dirIsNeg.z; if (node.splitAxis == 2) dirIsNeg = r.dirIsNeg[2];
#endif #endif
if (dirIsNeg) { if (dirIsNeg) {
todo[todoOffset++] = nodeNum + 1; todo[todoOffset++] = nodeNum + 1;