Add multisampling to librw

# Conflicts:
#	src/core/config.h
#	vendor/librw

4 files changed, 9 insertions, 1 deletions

diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index eb5551f9..b04f7c7e 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -578,6 +578,9 @@ void RwD3D8EngineSetRefreshRate(RwUInt32 refreshRate) {}
 RwBool RwD3D8DeviceSupportsDXTTexture(void) { return true; }
 
 
+void RwD3D8EngineSetMultiSamplingLevels(RwUInt32 level) { Engine::setMultiSamplingLevels(level); }
+RwUInt32 RwD3D8EngineGetMaxMultiSamplingLevels(void) { return Engine::getMaxMultiSamplingLevels(); }
+
 
 RpMaterial *RpMaterialCreate(void) { return Material::create(); }
 RwBool RpMaterialDestroy(RpMaterial *material) { material->destroy(); return true; }
diff --git a/src/fakerw/rwcore.h b/src/fakerw/rwcore.h
index 31bc5541..e5d21865 100644
--- a/src/fakerw/rwcore.h
+++ b/src/fakerw/rwcore.h
@@ -411,3 +411,5 @@ RwFrame     *RwCameraGetFrame(const RwCamera *camera);
 
 void RwD3D8EngineSetRefreshRate(RwUInt32 refreshRate);
 RwBool RwD3D8DeviceSupportsDXTTexture(void);
+void RwD3D8EngineSetMultiSamplingLevels(RwUInt32 level);
+RwUInt32 RwD3D8EngineGetMaxMultiSamplingLevels(void);
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index bc213c78..a20c1cc6 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -841,7 +841,10 @@ psSelectDevice()
 		
 		PSGLOBAL(fullScreen) = !FrontEndMenuManager.m_nPrefsWindowed;
 #endif
-	
+
+#ifdef MULTISAMPLING
+	RwD3D8EngineSetMultiSamplingLevels(1 << FrontEndMenuManager.m_nPrefsMSAALevel);
+#endif
 	return TRUE;
 }
 
diff --git a/vendor/librw b/vendor/librw
-Subproject d9def88c46a742c6bc74bf79021c0f8838480df
+Subproject efc0c307d79e8a7a7586cfecde109257b9fac73