LLRender things

indra/llrender/llcubemap.cpp

@@ -170,7 +170,7 @@ void LLCubeMap::init(const std::vector<LLPointer<LLImageRaw> >& rawimages)
 	}
 }
 
-GLuint LLCubeMap::getGLName()
+GLuint LLCubeMap::getGLName() const
 {
 	return mImages[0]->getTexName();
 }

indra/llrender/llcubemap.h

@@ -48,7 +48,7 @@ public:
 	
 	void enableTexture(S32 stage);
 	void enableTextureCoords(S32 stage);
-	S32	 getStage(void) { return mTextureStage; }
+	S32	 getStage(void) const { return mTextureStage; }
 	
 	void disable(void);
 	void disableTexture(void);
@@ -59,7 +59,7 @@ public:
 
 	void finishPaint();
 
-	GLuint getGLName();
+	GLuint getGLName() const;
 
 	LLVector3 map(U8 side, U16 v_val, U16 h_val) const;
 	BOOL project(F32& v_val, F32& h_val, BOOL& outside,

indra/llrender/llfontgl.h

@@ -33,7 +33,6 @@
 #include "llimagegl.h"
 #include "llpointer.h"
 #include "llrect.h"
-#include "v2math.h"
 
 class LLColor4;
 // Key used to request a font.

indra/llrender/llgl.h

@@ -32,14 +32,11 @@
 #include <boost/unordered_map.hpp>
 #include <list>
 
-#include "llerror.h"
-#include "v4color.h"
 #include "llstring.h"
 #include "stdtypes.h"
 #include "v4math.h"
 #include "llplane.h"
 #include "llgltypes.h"
-#include "llinstancetracker.h"
 
 #include "llglheaders.h"
 #include <glm/mat4x4.hpp>

indra/llrender/llimagegl.h

@@ -33,7 +33,6 @@
 #include "llgltypes.h"
 #include "llpointer.h"
 #include "llrefcount.h"
-#include "v2math.h"
 #include "llunits.h"
 
 #include "llrender.h"

indra/llrender/llrendernavprim.h

@@ -41,7 +41,6 @@ public:
 	void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const;
 	//Draw the contents of vertex buffer
 	void renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertCnt );
-private:
 };
 
 extern LLRenderNavPrim gRenderNav;

indra/llrender/lluiimage.h

@@ -30,7 +30,6 @@
 #include "v4color.h"
 #include "llpointer.h"
 #include "llrefcount.h"
-#include "llrefcount.h"
 #include "llrect.h"
 #include <boost/signals2.hpp>
 #include "llinitparam.h"

indra/llrender/llvertexbuffer.h

@@ -30,12 +30,10 @@
 #include "llgl.h"
 #include "v2math.h"
 #include "v3math.h"
-#include "v4math.h"
 #include "v4coloru.h"
 #include "llstrider.h"
 #include "llrender.h"
 #include "lltrace.h"
-#include <set>
 #include <vector>
 #include <list>
 #include <deque>
@@ -144,7 +142,6 @@ public:
 	static void initClass(bool use_vbo, bool no_vbo_mapping);
 	static void cleanupClass();
 	static void setupClientArrays(U32 data_mask);
-	static void pushPositions(U32 mode, const LLVector4a* pos, U32 count);
 	static void drawArrays(U32 mode, const std::vector<LLVector3>& pos, const std::vector<LLVector3>& norm);
 	static void drawElements(U32 mode, const S32 num_vertices, const LLVector4a* pos, const LLVector2* tc, S32 num_indices, const U16* indicesp);
 
@@ -255,7 +252,6 @@ public:
 	bool getTangentStrider(LLStrider<LLVector3>& strider, S32 index=0, S32 count = -1, bool map_range = false);
 	bool getTangentStrider(LLStrider<LLVector4a>& strider, S32 index=0, S32 count = -1, bool map_range = false);
 	bool getColorStrider(LLStrider<LLColor4U>& strider, S32 index=0, S32 count = -1, bool map_range = false);
-	bool getTextureIndexStrider(LLStrider<LLColor4U>& strider, S32 index=0, S32 count = -1, bool map_range = false);
 	bool getEmissiveStrider(LLStrider<LLColor4U>& strider, S32 index=0, S32 count = -1, bool map_range = false);
 	bool getWeightStrider(LLStrider<F32>& strider, S32 index=0, S32 count = -1, bool map_range = false);
 	bool getWeight4Strider(LLStrider<LLVector4a>& strider, S32 index=0, S32 count = -1, bool map_range = false);