a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 02:00:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	src/render/MBlur.cpp
#	src/render/MBlur.h
This commit is contained in:
Sergeanur 2020-06-30 07:45:54 +03:00
parent 6f81e84bd4 c80bdf3a2a
commit 1d2d5fe6ae
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/render/MBlur.cpp
View file

@ -1,5 +1,9 @@
#define WITHWINDOWS #define WITHWINDOWS
#define WITHD3D
#include "common.h" #include "common.h"
#ifndef LIBRW
#include <d3d8caps.h>
#endif
#include "RwHelper.h" #include "RwHelper.h"
#include "Camera.h" #include "Camera.h"
@ -18,6 +22,9 @@ static RwIm2DVertex Vertex[4];
static RwIm2DVertex Vertex2[4]; static RwIm2DVertex Vertex2[4];
static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 }; static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
#ifndef LIBRW
extern "C" D3DCAPS8 _RwD3D8DeviceCaps;
#endif
RwBool RwBool
CMBlur::MotionBlurOpen(RwCamera *cam) CMBlur::MotionBlurOpen(RwCamera *cam)
{ {
@ -65,12 +72,11 @@ CMBlur::MotionBlurOpen(RwCamera *cam)
if(BlurOn) if(BlurOn)
{ {
int32 width = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1); uint32 width = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
int32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1); uint32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
int32 depth = RwRasterGetDepth(RwCameraGetRaster(cam)); uint32 depth = RwRasterGetDepth(RwCameraGetRaster(cam));
#ifndef LIBRW #ifndef LIBRW
extern D3DCAPS8 _RwD3D8DeviceCaps;
extern DWORD _dwMemTotalVideo; extern DWORD _dwMemTotalVideo;
if ( _RwD3D8DeviceCaps.MaxTextureWidth >= width && _RwD3D8DeviceCaps.MaxTextureHeight >= height ) if ( _RwD3D8DeviceCaps.MaxTextureWidth >= width && _RwD3D8DeviceCaps.MaxTextureHeight >= height )
{ {