libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-05 06:59:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Region is not used in the viewport calculations - remove wrong commented out code

Browse Source
This commit is contained in:
Henrik Rydgard 2015-11-04 11:04:13 +01:00
parent 99e3ee1f71
commit 067431b35b
3 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
GPU/Directx9/StateMappingDX9.cpp
View File

@ -693,27 +693,18 @@ void TransformDrawEngineDX9::ApplyDrawState(int prim) {
renderY + scissorY2 * renderHeightFactor);
}
/*
int regionX1 = gstate.region1 & 0x3FF;
int regionY1 = (gstate.region1 >> 10) & 0x3FF;
int regionX2 = (gstate.region2 & 0x3FF) + 1;
int regionY2 = ((gstate.region2 >> 10) & 0x3FF) + 1;
*/
int regionX1 = 0;
int regionY1 = 0;
int regionX2 = gstate_c.curRTWidth;
int regionY2 = gstate_c.curRTHeight;
int curRTWidth = gstate_c.curRTWidth;
int curRTHeight = gstate_c.curRTHeight;
float offsetX = gstate.getOffsetX();
float offsetY = gstate.getOffsetY();
if (throughmode) {
// No viewport transform here. Let's experiment with using region.
dxstate.viewport.set(
renderX + (0 + regionX1) * renderWidthFactor,
renderY + (0 + regionY1) * renderHeightFactor,
(regionX2 - regionX1) * renderWidthFactor,
(regionY2 - regionY1) * renderHeightFactor,
renderX,
renderY,
curRTWidth * renderWidthFactor,
curRTHeight * renderHeightFactor,
0.f, 1.f);
} else {
float vpXScale = gstate.getViewportXScale();

29
GPU/GLES/StateMapping.cpp
View File

@ -793,16 +793,8 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
}
}
/*
int regionX1 = gstate.region1 & 0x3FF;
int regionY1 = (gstate.region1 >> 10) & 0x3FF;
int regionX2 = (gstate.region2 & 0x3FF) + 1;
int regionY2 = ((gstate.region2 >> 10) & 0x3FF) + 1;
*/
int regionX1 = 0;
int regionY1 = 0;
int regionX2 = gstate_c.curRTWidth;
int regionY2 = gstate_c.curRTHeight;
int curRTWidth = gstate_c.curRTWidth;
int curRTHeight = gstate_c.curRTHeight;
float offsetX = gstate.getOffsetX();
float offsetY = gstate.getOffsetY();
@ -812,17 +804,17 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
if (useBufferedRendering) {
// No flip needed
glstate.viewport.set(
renderX + displayOffsetX + (0 + regionX1) * renderWidthFactor,
renderY + displayOffsetY + (0 + regionY1) * renderHeightFactor,
(regionX2 - regionX1) * renderWidthFactor,
(regionY2 - regionY1) * renderHeightFactor);
renderX + displayOffsetX,
renderY + displayOffsetY,
curRTWidth * renderWidthFactor,
curRTHeight * renderHeightFactor);
} else {
renderY += renderHeight - framebufferManager_->GetTargetHeight() * renderHeightFactor;
glstate.viewport.set(
renderX + displayOffsetX + (0 + regionX1) * renderWidthFactor,
renderY + displayOffsetY + (0 - regionY1) * renderHeightFactor,
(regionX2 - regionX1) * renderWidthFactor,
(regionY2 - regionY1) * renderHeightFactor);
renderX + displayOffsetX,
renderY + displayOffsetY,
curRTWidth * renderWidthFactor,
curRTHeight * renderHeightFactor);
}
glstate.depthRange.set(0.0f, 1.0f);
} else {
@ -852,6 +844,7 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
vpHeight *= renderHeightFactor;
// Flip vpY0 to match the OpenGL coordinate system.
// TODO: This makes no sense anymore, in "flipped space".
vpY0 = renderHeight - vpY0;
// We used to apply the viewport here via glstate, but there are limits which vary by driver.

2
GPU/GPUState.h
View File

@ -509,7 +509,7 @@ struct GPUStateCache {
float vpWidth;
float vpHeight;
float vpDepth;
// Only used by Direct3D, not saved.
float vpXOffset;
float vpYOffset;
float vpWidthScale;