GL plugin now centers video output, you can set it to render to the full window and FPS can be shown. FPS and stretch to Window res is set in INI. Maybe also the window res actually changes correctly when resizing window in Windows?

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@287 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 10 insertions, 10 deletions

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
index 5ce9b1a8f9..62f07fd4d5 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
@@ -529,18 +529,18 @@ bool SetScissorRect()
     //printf("xoff: %d yoff: %d\n", xoff, yoff);

     RECT rc;

     rc.left = bpmem.scissorTL.x + xoff - 342;

-    rc.left *= MValue;

+    rc.left *= MValueX;

     if (rc.left < 0) rc.left = 0;

     rc.top = bpmem.scissorTL.y + yoff - 342;

-    rc.top *= MValue;

+    rc.top *= MValueY;

     if (rc.top < 0) rc.top = 0;

     

     rc.right = bpmem.scissorBR.x + xoff - 342 +1;

-    rc.right *= MValue;

-    if (rc.right > 640 * MValue) rc.right = 640 * MValue;

+    rc.right *= MValueX;

+    if (rc.right > 640 * MValueX) rc.right = 640 * MValueX;

     rc.bottom = bpmem.scissorBR.y + yoff - 342 +1;

-    rc.bottom *= MValue;

-    if (rc.bottom > 480 * MValue) rc.bottom = 480 * MValue;

+    rc.bottom *= MValueY;

+    if (rc.bottom > 480 * MValueY) rc.bottom = 480 * MValueY;

 

     //printf("scissor: lt=(%d,%d),rb=(%d,%d),off=(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom, xoff, yoff);

 

@@ -609,10 +609,10 @@ void LoadBPReg(u32 value0)
             };

             //Need another rc here to get it to scale.

             TRectangle multirc = {

-                (int)(bpmem.copyTexSrcXY.x * MValue),

-                (int)(bpmem.copyTexSrcXY.y * MValue),

-                (int)((bpmem.copyTexSrcXY.x * MValue + bpmem.copyTexSrcWH.x * MValue)),

-                (int)((bpmem.copyTexSrcXY.y * MValue + bpmem.copyTexSrcWH.y * MValue))

+                (int)(bpmem.copyTexSrcXY.x * MValueX),

+                (int)(bpmem.copyTexSrcXY.y * MValueY),

+                (int)((bpmem.copyTexSrcXY.x * MValueX + bpmem.copyTexSrcWH.x * MValueX)),

+                (int)((bpmem.copyTexSrcXY.y * MValueY + bpmem.copyTexSrcWH.y * MValueY))

             };

 

             UPE_Copy PE_copy;