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

Inline some functions in examples

Browse Source
This commit is contained in:
Matt Pharr
2011-09-16 17:02:21 -07:00
parent ca87579f23
commit cdc850f98c
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
examples/rt/rt.ispc
View File

@@ -70,9 +70,9 @@ static inline float Dot(const float3 a, const float3 b) {
} }
static void generateRay(uniform const float raster2camera[4][4], static inline void generateRay(uniform const float raster2camera[4][4],
uniform const float camera2world[4][4], uniform const float camera2world[4][4],
float x, float y, reference Ray ray) { float x, float y, reference Ray ray) {
ray.mint = 0.f; ray.mint = 0.f;
ray.maxt = 1e30f; ray.maxt = 1e30f;
@@ -177,8 +177,8 @@ static inline bool TriIntersect(const reference Triangle tri, reference Ray ray)
} }
bool BVHIntersect(const LinearBVHNode nodes[], const Triangle tris[], static inline bool BVHIntersect(const LinearBVHNode nodes[], const Triangle tris[],
reference Ray r) { reference Ray r) {
Ray ray = r; Ray ray = r;
bool hit = false; bool hit = false;
// Follow ray through BVH nodes to find primitive intersections // Follow ray through BVH nodes to find primitive intersections
@@ -226,15 +226,15 @@ bool BVHIntersect(const LinearBVHNode nodes[], const Triangle tris[],
} }
static void raytrace_tile(uniform int x0, uniform int x1, static inline void raytrace_tile(uniform int x0, uniform int x1,
uniform int y0, uniform int y1, uniform int y0, uniform int y1,
uniform int width, uniform int height, uniform int width, uniform int height,
uniform int baseWidth, uniform int baseHeight, uniform int baseWidth, uniform int baseHeight,
const uniform float raster2camera[4][4], const uniform float raster2camera[4][4],
const uniform float camera2world[4][4], const uniform float camera2world[4][4],
uniform float image[], uniform int id[], uniform float image[], uniform int id[],
const LinearBVHNode nodes[], const LinearBVHNode nodes[],
const Triangle triangles[]) { const Triangle triangles[]) {
uniform float widthScale = (float)(baseWidth) / (float)(width); uniform float widthScale = (float)(baseWidth) / (float)(width);
uniform float heightScale = (float)(baseHeight) / (float)(height); uniform float heightScale = (float)(baseHeight) / (float)(height);

2
examples/stencil/stencil.ispc
View File

@@ -32,7 +32,7 @@
*/ */
static void static inline void
stencil_step(uniform int x0, uniform int x1, stencil_step(uniform int x0, uniform int x1,
uniform int y0, uniform int y1, uniform int y0, uniform int y1,
uniform int z0, uniform int z1, uniform int z0, uniform int z1,