Merging in file-move-merge ( QAR-649 )

Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."

Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h

1 files changed, 89 insertions, 0 deletions

diff --git a/indra/llrender/llcubemap.h b/indra/llrender/llcubemap.h
new file mode 100644
index 0000000000..c273ab40ec
--- /dev/null
+++ b/indra/llrender/llcubemap.h
@@ -0,0 +1,89 @@
+/** 
+ * @file llcubemap.h
+ * @brief LLCubeMap class definition
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLCUBEMAP_H
+#define LL_LLCUBEMAP_H
+
+#include "llgl.h"
+
+#include <vector>
+
+class LLVector3;
+
+// Environment map hack!
+class LLCubeMap : public LLRefCount
+{
+public:
+	LLCubeMap();
+	void init(const std::vector<LLPointer<LLImageRaw> >& rawimages);
+	void initGL();
+	void initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages);
+	void initGLData();
+
+	void bind();
+	void enable(S32 stage);
+	
+	void enableTexture(S32 stage);
+	void enableTextureCoords(S32 stage);
+	
+	void disable(void);
+	void disableTexture(void);
+	void disableTextureCoords(void);
+	void setMatrix(S32 stage);
+	void restoreMatrix();
+	void setReflection (void);
+
+	void finishPaint();
+
+	GLuint getGLName();
+
+	LLVector3 map(U8 side, U16 v_val, U16 h_val) const;
+	BOOL project(F32& v_val, F32& h_val, BOOL& outside,
+						U8 side, const LLVector3& dir) const;
+	BOOL project(F32& v_min, F32& v_max, F32& h_min, F32& h_max, 
+						U8 side, LLVector3 dir[4]) const;
+	void paintIn(LLVector3 dir[4], const LLColor4U& col);
+	void destroyGL();
+
+public:
+	static bool sUseCubeMaps;
+
+protected:
+	~LLCubeMap();
+	LLGLenum mTargets[6];
+	LLPointer<LLImageGL> mImages[6];
+	LLPointer<LLImageRaw> mRawImages[6];
+	S32 mTextureStage;
+	S32 mTextureCoordStage;
+	S32 mMatrixStage;
+};
+
+#endif