From b072cbca93e9a0bded032fc79c678308d6875a58 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Mon, 29 Jun 2020 12:12:52 +0200
Subject: cleanup

---
 src/render/MBlur.cpp | 12 ++++++------
 src/render/MBlur.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/render')

diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index 0ab9e8df..f2b94848 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -188,31 +188,31 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
 }
 
 void
-CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 addalpha)
+CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha)
 {
 	RwRGBA color = { (RwUInt8)red, (RwUInt8)green, (RwUInt8)blue, (RwUInt8)blur };
 #ifdef GTA_PS2
 	if( pFrontBuffer )
-		OverlayRender(cam, pFrontBuffer, color, type, addalpha);
+		OverlayRender(cam, pFrontBuffer, color, type, bluralpha);
 #else
 	if(BlurOn){
 		if(pFrontBuffer){
 			if(ms_bJustInitialised)
 				ms_bJustInitialised = false;
 			else
-				OverlayRender(cam, pFrontBuffer, color, type, addalpha);
+				OverlayRender(cam, pFrontBuffer, color, type, bluralpha);
 		}
 		RwRasterPushContext(pFrontBuffer);
 		RwRasterRenderFast(RwCameraGetRaster(cam), 0, 0);
 		RwRasterPopContext();
 	}else{
-		OverlayRender(cam, nil, color, type, addalpha);
+		OverlayRender(cam, nil, color, type, bluralpha);
 	}
 #endif
 }
 
 void
-CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, uint32 addalpha)
+CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha)
 {
 	int r, g, b, a;
 
@@ -281,7 +281,7 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
 	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
 	RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
 
-	a = addalpha/2;
+	a = bluralpha/2;
 	if(a < 30)
 		a = 30;
 
diff --git a/src/render/MBlur.h b/src/render/MBlur.h
index 157f2882..e2e5d38c 100644
--- a/src/render/MBlur.h
+++ b/src/render/MBlur.h
@@ -12,6 +12,6 @@ public:
 	static RwBool MotionBlurOpen(RwCamera *cam);
 	static RwBool MotionBlurClose(void);
 	static void CreateImmediateModeData(RwCamera *cam, RwRect *rect);
-	static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 addalpha);
-	static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, uint32 bluralpha);
+	static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha);
+	static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha);
 };
-- 
cgit v1.2.3


From 6d396ba73b8954bd44df9e1700ee1a5815956428 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Tue, 30 Jun 2020 07:43:20 +0300
Subject: Fix MBlur

---
 src/render/MBlur.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/render')

diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index f2b94848..fe30ee0b 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -1,5 +1,9 @@
 #define WITHWINDOWS
+#define WITHD3D
 #include "common.h"
+#ifndef LIBRW
+#include <d3d8caps.h>
+#endif
 
 #include "RwHelper.h"
 #include "Camera.h"
@@ -15,6 +19,9 @@ bool CMBlur::BlurOn;
 static RwIm2DVertex Vertex[4];
 static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
 
+#ifndef LIBRW
+extern "C" D3DCAPS8 _RwD3D8DeviceCaps;
+#endif
 RwBool
 CMBlur::MotionBlurOpen(RwCamera *cam)
 {
@@ -62,12 +69,11 @@ CMBlur::MotionBlurOpen(RwCamera *cam)
 		
 	if(BlurOn)
 	{
-		int32 width  = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
-		int32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
-		int32 depth  = RwRasterGetDepth(RwCameraGetRaster(cam));
+		uint32 width  = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
+		uint32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
+		uint32 depth  = RwRasterGetDepth(RwCameraGetRaster(cam));
 		
 #ifndef LIBRW
-		extern D3DCAPS8 _RwD3D8DeviceCaps;
 		extern DWORD _dwMemTotalVideo;
 		if ( _RwD3D8DeviceCaps.MaxTextureWidth >= width && _RwD3D8DeviceCaps.MaxTextureHeight >= height )
 		{
-- 
cgit v1.2.3