Tweaked naming a bit, also white space.

Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.

3 files changed, 92 insertions, 92 deletions

diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp
index fcac016ed7..14d0a744bb 100644
--- a/indra/llrender/llcubemap.cpp
+++ b/indra/llrender/llcubemap.cpp
@@ -87,9 +87,9 @@ void LLCubeMap::initGL()
 			for (int i = 0; i < 6; i++)
 			{
 				mImages[i] = new LLImageGL(RESOLUTION, RESOLUTION, 4, FALSE);
-				if (mIssRGB) {
-					mImages[i]->setExplicitFormat(GL_SRGB8_ALPHA8, GL_RGBA);
-				}
+                if (mIssRGB) {
+                    mImages[i]->setExplicitFormat(GL_SRGB8_ALPHA8, GL_RGBA);
+                }
 				mImages[i]->setTarget(mTargets[i], LLTexUnit::TT_CUBE_MAP);
 				mRawImages[i] = new LLImageRaw(RESOLUTION, RESOLUTION, 4);
 				mImages[i]->createGLTexture(0, mRawImages[i], texname);
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index d3f8431654..2d526a2113 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -184,47 +184,47 @@ void LLImageGL::cleanupClass()
 //static
 S32 LLImageGL::dataFormatBits(S32 dataformat)
 {
-	switch (dataformat)
-	{
-	  case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:	return 4;
-	  case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: return 4;
-	  case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:	return 8;
-	  case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: return 8;
-	  case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:	return 8;
-	  case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: return 8;
-	  case GL_LUMINANCE:						return 8;
-	  case GL_ALPHA:							return 8;
-	  case GL_COLOR_INDEX:						return 8;
-	  case GL_LUMINANCE_ALPHA:					return 16;
-	  case GL_RGB:								return 24;
-	  case GL_SRGB:								return 24;
-	  case GL_RGB8:								return 24;
-	  case GL_RGBA:								return 32;
-	  case GL_SRGB_ALPHA:						return 32;
-	  case GL_BGRA:								return 32;		// Used for QuickTime media textures on the Mac
-	  default:
-		LL_ERRS() << "LLImageGL::Unknown format: " << dataformat << LL_ENDL;
-		return 0;
-	}
+    switch (dataformat)
+    {
+    case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:	        return 4;
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:    return 4;
+    case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:	        return 8;
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:    return 8;
+    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:	        return 8;
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:    return 8;
+    case GL_LUMINANCE:						        return 8;
+    case GL_ALPHA:							        return 8;
+    case GL_COLOR_INDEX:						    return 8;
+    case GL_LUMINANCE_ALPHA:					    return 16;
+    case GL_RGB:								    return 24;
+    case GL_SRGB:								    return 24;
+    case GL_RGB8:								    return 24;
+    case GL_RGBA:								    return 32;
+    case GL_SRGB_ALPHA:						        return 32;
+    case GL_BGRA:								    return 32;		// Used for QuickTime media textures on the Mac
+    default:
+        LL_ERRS() << "LLImageGL::Unknown format: " << dataformat << LL_ENDL;
+        return 0;
+    }
 }
 
 //static
 S32 LLImageGL::dataFormatBytes(S32 dataformat, S32 width, S32 height)
 {
-	switch (dataformat)
-	{
-	case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-	case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-	case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-	case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-	case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-	case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-		if (width < 4) width = 4;
-		if (height < 4) height = 4;
-		break;
-	default:
-		break;
-	}
+    switch (dataformat)
+    {
+    case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+    case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
+        if (width < 4) width = 4;
+        if (height < 4) height = 4;
+        break;
+    default:
+        break;
+    }
 	S32 bytes ((width*height*dataFormatBits(dataformat)+7)>>3);
 	S32 aligned = (bytes+3)&~3;
 	return aligned;
@@ -669,19 +669,19 @@ BOOL LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 	LL_RECORD_BLOCK_TIME(FTM_SET_IMAGE);
 	bool is_compressed = false;
 
-	switch (mFormatPrimary)
-	{
-	case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-	case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-	case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-	case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-	case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-	case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-		is_compressed = true;
-		break;
-	default:
-		break;
-	}
+    switch (mFormatPrimary)
+    {
+    case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+    case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
+        is_compressed = true;
+        break;
+    default:
+        break;
+    }
 	
 	
 	
@@ -1255,18 +1255,18 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
 			case GL_RGB8:
 				intformat = GL_COMPRESSED_RGB; 
 				break;
-			case GL_SRGB:
-			case GL_SRGB8:
-				intformat = GL_COMPRESSED_SRGB;
-				break;
+            case GL_SRGB:
+            case GL_SRGB8:
+                intformat = GL_COMPRESSED_SRGB;
+                break;
 			case GL_RGBA:
 			case GL_RGBA8:
 				intformat = GL_COMPRESSED_RGBA; 
 				break;
-			case GL_SRGB_ALPHA:
-			case GL_SRGB8_ALPHA8:
-				intformat = GL_COMPRESSED_SRGB_ALPHA;
-				break;
+            case GL_SRGB_ALPHA:
+            case GL_SRGB8_ALPHA8:
+                intformat = GL_COMPRESSED_SRGB_ALPHA;
+                break;
 			case GL_LUMINANCE:
 			case GL_LUMINANCE8:
 				intformat = GL_COMPRESSED_LUMINANCE;
@@ -1824,30 +1824,30 @@ void LLImageGL::calcAlphaChannelOffsetAndStride()
 	}
 
 	mAlphaStride = -1 ;
-	switch (mFormatPrimary)
-	{
-	case GL_LUMINANCE:
-	case GL_ALPHA:
-		mAlphaStride = 1;
-		break;
-	case GL_LUMINANCE_ALPHA:
-		mAlphaStride = 2;
-		break;
-	case GL_RGB:
-	case GL_SRGB:
-		mNeedsAlphaAndPickMask = FALSE ;
-		mIsMask = FALSE;
-		return ; //no alpha channel.
-	case GL_RGBA:
-	case GL_SRGB_ALPHA:
-		mAlphaStride = 4;
-		break;
-	case GL_BGRA_EXT:
-		mAlphaStride = 4;
-		break;
-	default:
-		break;
-	}
+    switch (mFormatPrimary)
+    {
+    case GL_LUMINANCE:
+    case GL_ALPHA:
+        mAlphaStride = 1;
+        break;
+    case GL_LUMINANCE_ALPHA:
+        mAlphaStride = 2;
+        break;
+    case GL_RGB:
+    case GL_SRGB:
+        mNeedsAlphaAndPickMask = FALSE;
+        mIsMask = FALSE;
+        return; //no alpha channel.
+    case GL_RGBA:
+    case GL_SRGB_ALPHA:
+        mAlphaStride = 4;
+        break;
+    case GL_BGRA_EXT:
+        mAlphaStride = 4;
+        break;
+    default:
+        break;
+    }
 
 	mAlphaOffset = -1 ;
 	if (mFormatType == GL_UNSIGNED_BYTE)
@@ -2030,13 +2030,13 @@ void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
 
 	freePickMask();
 
-	if (mFormatType != GL_UNSIGNED_BYTE ||
-	    mFormatPrimary != GL_RGBA ||
-		mFormatPrimary != GL_SRGB_ALPHA)
-	{
-		//cannot generate a pick mask for this texture
-		return;
-	}
+    if (mFormatType != GL_UNSIGNED_BYTE ||
+        mFormatPrimary != GL_RGBA ||
+        mFormatPrimary != GL_SRGB_ALPHA)
+    {
+        //cannot generate a pick mask for this texture
+        return;
+    }
 
 #ifdef SHOW_ASSERT
 	const U32 pickSize = createPickMask(width, height);
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index fe6010fabd..2bf7ad9902 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1193,7 +1193,7 @@ void LLRender::syncLightState()
 		shader->uniform3fv(LLShaderMgr::LIGHT_DIRECTION, 8, direction[0].mV);
 		shader->uniform4fv(LLShaderMgr::LIGHT_ATTENUATION, 8, attenuation[0].mV);
 		shader->uniform3fv(LLShaderMgr::LIGHT_DIFFUSE, 8, diffuse[0].mV);
-		shader->uniform4fv(LLShaderMgr::LIGHT_AMBIENT, 1, srgbColor4(mAmbientLightColor).mV);
+		shader->uniform4fv(LLShaderMgr::LIGHT_AMBIENT, 1, mAmbientLightColor.mV);
         shader->uniform1i(LLShaderMgr::SUN_UP_FACTOR, sun_primary[0] ? 1 : 0);
         shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, diffuse_b[0].mV);
 	}