From cdc850f98c8bd110a60f423ffcf4855eb983de8b Mon Sep 17 00:00:00 2001 From: Matt Pharr Date: Fri, 16 Sep 2011 17:02:21 -0700 Subject: [PATCH] Inline some functions in examples --- examples/rt/rt.ispc | 28 ++++++++++++++-------------- examples/stencil/stencil.ispc | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/rt/rt.ispc b/examples/rt/rt.ispc index 92ca2421..8376e36a 100644 --- a/examples/rt/rt.ispc +++ b/examples/rt/rt.ispc @@ -70,9 +70,9 @@ static inline float Dot(const float3 a, const float3 b) { } -static void generateRay(uniform const float raster2camera[4][4], - uniform const float camera2world[4][4], - float x, float y, reference Ray ray) { +static inline void generateRay(uniform const float raster2camera[4][4], + uniform const float camera2world[4][4], + float x, float y, reference Ray ray) { ray.mint = 0.f; 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[], - reference Ray r) { +static inline bool BVHIntersect(const LinearBVHNode nodes[], const Triangle tris[], + reference Ray r) { Ray ray = r; bool hit = false; // 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, - uniform int y0, uniform int y1, - uniform int width, uniform int height, - uniform int baseWidth, uniform int baseHeight, - const uniform float raster2camera[4][4], - const uniform float camera2world[4][4], - uniform float image[], uniform int id[], - const LinearBVHNode nodes[], - const Triangle triangles[]) { +static inline void raytrace_tile(uniform int x0, uniform int x1, + uniform int y0, uniform int y1, + uniform int width, uniform int height, + uniform int baseWidth, uniform int baseHeight, + const uniform float raster2camera[4][4], + const uniform float camera2world[4][4], + uniform float image[], uniform int id[], + const LinearBVHNode nodes[], + const Triangle triangles[]) { uniform float widthScale = (float)(baseWidth) / (float)(width); uniform float heightScale = (float)(baseHeight) / (float)(height); diff --git a/examples/stencil/stencil.ispc b/examples/stencil/stencil.ispc index d707640c..849f9a39 100644 --- a/examples/stencil/stencil.ispc +++ b/examples/stencil/stencil.ispc @@ -32,7 +32,7 @@ */ -static void +static inline void stencil_step(uniform int x0, uniform int x1, uniform int y0, uniform int y1, uniform int z0, uniform int z1,