diff options
author | callum_linden <none@none> | 2014-10-20 14:00:39 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2014-10-20 14:00:39 -0700 |
commit | 577a3973ea1bc268b14ba3101474fb0b9a9bade1 (patch) | |
tree | 4bbe95bf73cf7fac29683fc0f00eec2b15f701d0 /indra/newview/llvosky.cpp | |
parent | c853b470db48d9bdda0a336068c4bbbe2ab2761f (diff) |
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
Diffstat (limited to 'indra/newview/llvosky.cpp')
-rwxr-xr-x | indra/newview/llvosky.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 07c2f0d44d..4dab213fa0 100755 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -62,8 +62,6 @@ static const S32 NUM_TILES = NUM_TILES_X * NUM_TILES_Y; static const F32 SUN_DISK_RADIUS = 0.5f; static const F32 MOON_DISK_RADIUS = SUN_DISK_RADIUS * 0.9f; static const F32 SUN_INTENSITY = 1e5; -static const F32 SUN_DISK_INTENSITY = 24.f; - // Texture coordinates: static const LLVector2 TEX00 = LLVector2(0.f, 0.f); @@ -619,21 +617,6 @@ static inline LLColor3 colorMix(LLColor3 const & left, LLColor3 const & right, F return (left + ((right - left) * amount)); } -static inline F32 texture2D(LLPointer<LLImageRaw> const & tex, LLVector2 const & uv) -{ - U16 w = tex->getWidth(); - U16 h = tex->getHeight(); - - U16 r = U16(uv[0] * w) % w; - U16 c = U16(uv[1] * h) % h; - - U8 const * imageBuffer = tex->getData(); - - U8 sample = imageBuffer[r * w + c]; - - return sample / 255.f; -} - static inline LLColor3 smear(F32 val) { return LLColor3(val, val, val); |