1 files changed, 27 insertions, 3 deletions

diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index c4ff2dd2..26b5ae3d 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -290,9 +290,29 @@ RwTextureAddressMode RwTextureGetAddressingV(const RwTexture *texture);
 // TODO
 void _rwD3D8TexDictionaryEnableRasterFormatConversion(bool enable) { }
 
+static rw::Raster*
+ConvertTexRaster(rw::Raster *ras)
+{
+	using namespace rw;
+	Image *img = ras->toImage();
+	ras->destroy();
+	img->unindex();
+	ras = Raster::createFromImage(img);
+	img->destroy();
+	return ras;
+}
+
 // hack for reading native textures
 RwBool rwNativeTextureHackRead(RwStream *stream, RwTexture **tex, RwInt32 size)
-	{ *tex = Texture::streamReadNative(stream); return *tex != nil; }
+{
+	*tex = Texture::streamReadNative(stream);
+#ifdef RW_GL3
+	if(strcmp((*tex)->name, "copnu") == 0)
+		tex = tex;
+	(*tex)->raster = ConvertTexRaster((*tex)->raster);
+#endif
+	return *tex != nil;
+}
 
 
 
@@ -460,13 +480,17 @@ RwBool RwRenderStateSet(RwRenderState state, void *value)
 	}
 }
 
-
-static EngineOpenParams openParams;
 // WARNING: unused parameters
 RwBool RwEngineInit(RwMemoryFunctions *memFuncs, RwUInt32 initFlags, RwUInt32 resArenaSize) { Engine::init(); return true; }
 // TODO: this is platform dependent
 RwBool RwEngineOpen(RwEngineOpenParams *initParams) {
+#if defined RW_D3D9 || defined RWLIBS
+	static EngineOpenParams openParams;
 	openParams.window = (HWND)initParams->displayID;
+#else
+	extern EngineOpenParams openParams;
+	openParams.window = (GLFWwindow**)initParams->displayID;
+#endif
 	return Engine::open(&openParams);
 }
 RwBool RwEngineStart(void) {