applied Charlies patch for game engine graphics. display list support, and bumpmapping shader improvements.

1 files changed, 18 insertions, 2 deletions

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
index d0fd6006ab6..06a6fb4bb3a 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
@@ -36,8 +36,11 @@
 
 class RAS_VAOpenGLRasterizer : public RAS_OpenGLRasterizer
 {
+	void TexCoordPtr(const RAS_TexVert *tv, int unit);
+	bool m_Lock;
+
 public:
-	RAS_VAOpenGLRasterizer(RAS_ICanvas* canvas);
+	RAS_VAOpenGLRasterizer(RAS_ICanvas* canvas, bool lock=false);
 	virtual ~RAS_VAOpenGLRasterizer();
 
 	virtual bool	Init();
@@ -51,10 +54,23 @@ public:
 		class RAS_IPolyMaterial* polymat,
 		class RAS_IRenderTools* rendertools,
 		bool useObjectColor,
-		const MT_Vector4& rgbacolor);
+		const MT_Vector4& rgbacolor,
+		class KX_ListSlot** slot);
+
+	virtual void IndexPrimitivesMulti( 
+		const vecVertexArray& vertexarrays,
+		const vecIndexArrays & indexarrays,
+		int mode,
+		class RAS_IPolyMaterial* polymat,
+		class RAS_IRenderTools* rendertools,
+		bool useObjectColor,
+		const MT_Vector4& rgbacolor,
+		class KX_ListSlot** slot);
 
 
 	virtual void	EnableTextures(bool enable);
+	//virtual bool	QueryArrays(){return true;}
+	//virtual bool	QueryLists(){return m_Lock;}
 
 };