These files were meant to be part of the previous checkin. I blame AnkhSVN yet again. Someone needs to write a Subversion tool with proper changelist support!

JGE/include/JRenderer.h

@@ -144,6 +144,15 @@ public:
 	//////////////////////////////////////////////////////////////////////////
 	JTexture* LoadTexture(const char* filename, int mode = 0, int textureFormat = TEXTURE_FORMAT);
 
+    /*
+    ** Helper function - on Win, LoadTexture previously performed the image transfer into GL memory.
+    ** However, this doesn't work if you want to call LoadTexture in a separate worker thread, as 
+    ** OpenGL has a limitation where only one thread can run the context. Now, the image loading/decompression
+    ** happens in LoadTexture, and the JQuad constructor will complete the texture binding with this helper function.
+    */
+#if defined (WIN32) || defined (LINUX)
+    void static TransferTextureToGLContext(JTexture& inTexture);
+#endif
 	//////////////////////////////////////////////////////////////////////////
 	/// Create texture from memory on the fly.
 	///

JGE/include/JTypes.h

@@ -340,8 +340,9 @@ public:
 
 #if defined (WIN32) || defined (LINUX) || defined (IOS) 	
 	GLuint mTexId;
+    u8* mBuffer;
 #else
-  int mTextureFormat;
+    int mTextureFormat;
 	int mTexId;
 	bool mInVideoRAM;
 	PIXEL_TYPE* mBits;