Widescreen rework & IR scaling

libs/JSystem/include/JSystem/JUtility/JUTVideo.h

@@ -33,24 +33,16 @@ public:
     static void postRetraceProc(u32);
     static void drawDoneCallback();
 
-    u16 getFbWidth() const {
-        #if TARGET_PC
-        return m_WindowSize.fb_width;
-        #else
-        return mRenderObj->fbWidth;
-        #endif
-    }
-    u16 getEfbHeight() const {
-        #if TARGET_PC
-        return m_WindowSize.fb_height;
-        #else
-        return mRenderObj->efbHeight;
-        #endif
-    }
+    u16 getFbWidth() const { return mRenderObj->fbWidth; }
+    u16 getEfbHeight() const { return mRenderObj->efbHeight; }
     void getBounds(u16& width, u16& height) const {
         width = (u16)getFbWidth();
         height = (u16)getEfbHeight();
     }
+#ifdef TARGET_PC
+    u32 getRenderWidth() const { return mRenderWidth; }
+    u32 getRenderHeight() const { return mRenderHeight; }
+#endif
     u16 getXfbHeight() const { return u16(mRenderObj->xfbHeight); }
     u8 isAntiAliasing() const { return u8(mRenderObj->aa); }
     Pattern getSamplePattern() const { return mRenderObj->sample_pattern; }
@@ -63,7 +55,7 @@ public:
 
     GXRenderModeObj* getRenderMode() const { return mRenderObj; }
 #if TARGET_PC
-    void setWindowSize(AuroraWindowSize const& size);
+    void setRenderSize(u32 width, u32 height);
 #endif
 
 private:
@@ -89,7 +81,8 @@ private:
 
 #if TARGET_PC
 public:
-    AuroraWindowSize m_WindowSize;
+    u32 mRenderWidth;
+    u32 mRenderHeight;
 #endif
 };
 

libs/JSystem/src/J2DGraph/J2DGrafContext.cpp

@@ -64,10 +64,6 @@ void J2DGrafContext::setup2D() {
 }
 
 void J2DGrafContext::setScissor() {
-#if TARGET_PC
-    GXSetScissor(mScissorBounds.i.x, mScissorBounds.i.y, mScissorBounds.getWidth(),
-                 mScissorBounds.getHeight());
-#else
     JGeometry::TBox2<f32> bounds(0, 0, 1024, 1024);
     JGeometry::TBox2<f32> curBounds(mScissorBounds);
     mScissorBounds.intersect(bounds);
@@ -81,7 +77,6 @@ void J2DGrafContext::setScissor() {
     } else {
         GXSetScissor(0, 0, 0, 0);
     }
-#endif
 }
 
 void J2DGrafContext::scissor(JGeometry::TBox2<f32> const& bounds) {

libs/JSystem/src/JUtility/JUTVideo.cpp

@@ -205,7 +205,8 @@ void JUTVideo::setRenderMode(GXRenderModeObj const* pObj) {
 void JUTVideo::waitRetraceIfNeed() {}
 
 #if TARGET_PC
-void JUTVideo::setWindowSize(AuroraWindowSize const& size) {
-    m_WindowSize = size;
+void JUTVideo::setRenderSize(u32 width, u32 height) {
+    mRenderWidth = width;
+    mRenderHeight = height;
 }
 #endif