From 872a8ed1bf635a62a65d3b2a92b7d2fbb368eea1 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 8 May 2013 17:33:25 +0000 Subject: Cycles / Hair rendering: * Enable hair rendering on the GPU. Patch by Stuart Broadfoot, with small tweaks by me, to only enable it on sm_20 and above. --- intern/cycles/util/util_transform.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h index 617ba43a5ed..10120ed5fdb 100644 --- a/intern/cycles/util/util_transform.h +++ b/intern/cycles/util/util_transform.h @@ -97,17 +97,6 @@ __device_inline float3 transform_direction_transposed(const Transform *t, const return make_float3(dot(x, a), dot(y, a), dot(z, a)); } -#ifndef __KERNEL_GPU__ - -__device_inline void print_transform(const char *label, const Transform& t) -{ - print_float4(label, t.x); - print_float4(label, t.y); - print_float4(label, t.z); - print_float4(label, t.w); - printf("\n"); -} - __device_inline Transform transform_transpose(const Transform a) { Transform t; @@ -148,6 +137,17 @@ __device_inline Transform make_transform(float a, float b, float c, float d, return t; } +#ifndef __KERNEL_GPU__ + +__device_inline void print_transform(const char *label, const Transform& t) +{ + print_float4(label, t.x); + print_float4(label, t.y); + print_float4(label, t.z); + print_float4(label, t.w); + printf("\n"); +} + __device_inline Transform transform_translate(float3 t) { return make_transform( -- cgit v1.2.3