diff options
| author | Vinson Lee <[email protected]> | 2010-03-29 13:58:39 -0700 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2010-03-29 13:58:39 -0700 |
| commit | 52f728921563192ccbabf5ffe98234d8d330b933 (patch) | |
| tree | bae605a07a25a26c3045461a315dce142280ae0d /progs/glsl | |
| parent | bbe6788807db1fd1cbb1b227cf0ecfcc02db90d8 (diff) | |
progs/glsl: Remove inline keyword.
Fixes MSVC build.
Diffstat (limited to 'progs/glsl')
| -rw-r--r-- | progs/glsl/fsraytrace.c | 6 | ||||
| -rw-r--r-- | progs/glsl/vsraytrace.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/progs/glsl/fsraytrace.c b/progs/glsl/fsraytrace.c index 392f01b200d..dcfc1949874 100644 --- a/progs/glsl/fsraytrace.c +++ b/progs/glsl/fsraytrace.c @@ -221,14 +221,14 @@ static const char* fsSource = " gl_FragColor = trace1(r); \n" "}\n"; -static inline +static float deg2rad(const float degree) { return( degree * 0.017453292519943295769236907684886F); } -static inline void +static void rotate_xy(float* mat3, const float degreesAroundX, const float degreesAroundY) { const float rad1 = deg2rad(degreesAroundX); @@ -242,7 +242,7 @@ rotate_xy(float* mat3, const float degreesAroundX, const float degreesAroundY) mat3[2] = -c1*s2;mat3[5] = s1; mat3[8] = c1*c2; } -static inline void +static void identity(float* mat3) { mat3[0] = 1.0F; mat3[3] = 0.0F; mat3[6] = 0.0F; diff --git a/progs/glsl/vsraytrace.c b/progs/glsl/vsraytrace.c index ee4fe477619..67832b8a46d 100644 --- a/progs/glsl/vsraytrace.c +++ b/progs/glsl/vsraytrace.c @@ -212,14 +212,14 @@ static const char* vsSource = "}\n"; -static inline +static float deg2rad(const float degree) { return( degree * 0.017453292519943295769236907684886F); } -static inline void +static void rotate_xy(float* mat3, const float degreesAroundX, const float degreesAroundY) { const float rad1 = deg2rad(degreesAroundX); @@ -233,7 +233,7 @@ rotate_xy(float* mat3, const float degreesAroundX, const float degreesAroundY) mat3[2] = -c1*s2;mat3[5] = s1; mat3[8] = c1*c2; } -static inline void +static void identity(float* mat3) { mat3[0] = 1.0F; mat3[3] = 0.0F; mat3[6] = 0.0F; |