ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CxbxUpdateHostTextureScaling accounts for multisampling 

Fixes Max Payne 2 bullet time
which uses MSAA and the backbuffer as a texture
This commit is contained in:
Anthony 2021-02-08 03:44:34 +13:00
parent d7c9e78195
commit d9a2e7a715
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -2918,15 +2918,15 @@ void GetScreenScaleFactors(float& scaleX, float& scaleY) {
}
// Get the raw subpixel dimensions of the rendertarget buffer
void GetRenderTargetRawDimensions(float& x, float&y) {
x = (float) GetPixelContainerWidth(g_pXbox_RenderTarget);
y = (float) GetPixelContainerHeight(g_pXbox_RenderTarget);
void GetRenderTargetRawDimensions(float& x, float&y, xbox::X_D3DSurface* rt) {
x = (float) GetPixelContainerWidth(rt);
y = (float) GetPixelContainerHeight(rt);
}
// Get the base rendertarget dimensions excluding multisample scaling
// e.g. a raw 1280*960 rendertarget with 2x MSAA would be have a base 640*480
void GetRenderTargetBaseDimensions(float& x, float& y) {
GetRenderTargetRawDimensions(x, y);
GetRenderTargetRawDimensions(x, y, g_pXbox_RenderTarget);
float aaX, aaY;
GetMultiSampleScaleRaw(aaX, aaY);
@ -2935,6 +2935,19 @@ void GetRenderTargetBaseDimensions(float& x, float& y) {
y /= aaY;
}
// Get the pixel dimensions of the backbuffer, accounting for multisample mode
void GetBackBufferPixelDimensions(float& x, float& y) {
GetRenderTargetRawDimensions(x, y, g_pXbox_BackBufferSurface);
// MSAA introduces subpixels, so scale them away
if (g_Xbox_MultiSampleType & xbox::X_D3DMULTISAMPLE_SAMPLING_MULTI) {
float aaX, aaY;
GetMultiSampleScaleRaw(aaX, aaY);
x /= aaX;
y /= aaY;
}
}
void Direct3D_CreateDevice_Start
(
const xbox::X_D3DPRESENT_PARAMETERS *pPresentationParameters
@ -7385,9 +7398,20 @@ void CxbxUpdateHostTextureScaling()
// Set scaling factor for this texture, which will be applied to
// all texture-coordinates in CxbxVertexShaderTemplate.hlsl
// Note : Linear textures are two-dimensional at most (right?)
float width, height;
if ((xbox::X_D3DSurface*)pXboxBaseTexture == g_pXbox_BackBufferSurface) {
// Account for MSAA
// Test case: Max Payne 2 (bullet time)
GetBackBufferPixelDimensions(width, height);
}
else {
width = (float)GetPixelContainerWidth(pXboxBaseTexture);
height = (float)GetPixelContainerHeight(pXboxBaseTexture);
}
*texCoordScale = {
(float)GetPixelContainerWidth(pXboxBaseTexture),
(float)GetPixelContainerHeight(pXboxBaseTexture),
width,
height,
(float)CxbxGetPixelContainerDepth(pXboxBaseTexture),
1.0f
};