Widescreen rework & IR scaling

src/d/actor/d_a_movie_player.cpp

@@ -3342,13 +3342,8 @@ static void daMP_THPGXYuv2RgbSetup(const GXRenderModeObj* rmode) {
 	Mtx44 m;
 	Mtx e_m;
 
-#if TARGET_PC
-    w = JUTVideo::getManager()->getFbWidth();
-    h = JUTVideo::getManager()->getEfbHeight();
-#else
     w = rmode->fbWidth;
     h = rmode->efbHeight;
-#endif
     var_f31 = 0.0f;
 
     #if WIDESCREEN_SUPPORT

src/d/d_file_select.cpp

@@ -3870,16 +3870,10 @@ void dFile_select_c::_draw() {
         dComIfGd_set2DOpa(mSelIcon2);
 
         #if PLATFORM_GCN
-        #if TARGET_PC
-        mpFadePict->draw(0, 0,
-                           mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), false, false,
-                           false);
-        #else
         mpFadePict->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
                            mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false,
                            false);
         #endif
-        #endif
     }
 }
 

src/d/d_gameover.cpp

@@ -37,11 +37,10 @@ void dDlst_Gameover_CAPTURE_c::draw() {
     TGXTexObj tex_obj;
     Mtx44 m;
 
-#if TARGET_PC
-    GXSetTexCopySrc(0, 0, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-    GXSetTexCopyDst(mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), GX_TF_RGB565, GX_TRUE);
-#else
     GXSetTexCopySrc(0, 0, FB_WIDTH, FB_HEIGHT);
+#if TARGET_PC
+    GXSetTexCopyDst(FB_WIDTH, FB_HEIGHT, GX_TF_RGB565, GX_FALSE);
+#else
     GXSetTexCopyDst(FB_WIDTH / 2, FB_HEIGHT / 2, GX_TF_RGB565, GX_TRUE);
 #endif
     GXCopyTex(mDoGph_gInf_c::mZbufferTex, 0);

src/d/d_map_path.cpp

@@ -16,10 +16,6 @@
 
 #ifdef TARGET_PC
 constexpr u16 kMapResolutionMultiplier = 4;
-// Line widths are relative to the framebuffer size. Since we're rendering to a separate
-// framebuffer, we have to scale them accordingly. The original game used about half of the
-// EFB for the map rendering, so this is a reasonable approximation.
-constexpr u8 kMapLineWidthMultiplier = 2;
 #endif
 
 void dMpath_n::dTexObjAggregate_c::create() {
@@ -242,11 +238,7 @@ void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) {
         int width = getLineWidth(p_line->field_0x1);
 
         if (width > 0 && p_line->mDataNum >= 2) {
-#ifdef TARGET_PC
-            GXSetLineWidth(width * kMapLineWidthMultiplier, GX_TO_ZERO);
-#else
-            GXSetLineWidth(width * 2, GX_TO_ZERO);
-#endif
+            GXSetLineWidth(width, GX_TO_ZERO);
             GXSetTevColor(GX_TEVREG0, *getLineColor(p_line->field_0x0 & 0x3F, p_line->field_0x1));
             GXBegin(GX_LINESTRIP, GX_VTXFMT0, p_line->mDataNum);
 
@@ -435,8 +427,12 @@ void dRenderingFDAmap_c::preRenderingMap() {
     const u16 w = mTexWidth * kMapResolutionMultiplier;
     const u16 h = mTexHeight * kMapResolutionMultiplier;
     GXCreateFrameBuffer(w, h);
-    GXSetViewport(0.0f, 0.0f, w, h, 0.0f, 1.0f);
-    GXSetScissor(0, 0, w, h);
+    // Set logical viewport dimensions
+    GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
+    GXSetScissor(0, 0, mTexWidth, mTexHeight);
+    // Set render viewport dimensions
+    GXSetViewportRender(0.0f, 0.0f, w, h, 0.0f, 1.0f);
+    GXSetScissorRender(0, 0, w, h);
 #else
     GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
     GXSetScissor(0, 0, mTexWidth, mTexHeight);
@@ -517,13 +513,8 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li
 
     BE(u16)* data_p = p_line->mpData;
     s32 data_num = p_line->mDataNum;
-#ifdef TARGET_PC
-    GXSetLineWidth(width * kMapLineWidthMultiplier, GX_TO_ZERO);
-    GXSetPointSize(width * kMapLineWidthMultiplier, GX_TO_ONE);
-#else
     GXSetLineWidth(width, GX_TO_ONE);
     GXSetPointSize(width, GX_TO_ONE);
-#endif
     GXColor lineColor = *getDecoLineColor(p_line->field_0x0 & 0x3f, p_line->field_0x1);
     GXSetTevColor(GX_TEVREG0, lineColor);
     lineColor.r = lineColor.r - 4;

src/d/d_menu_collect.cpp

@@ -2688,12 +2688,7 @@ u8 dMenu_Collect3D_c::getMaskMdlVisible() {
 f32 dMenu_Collect3D_c::mViewOffsetY = -100.0f;
 
 void dMenu_Collect3D_c::setupItem3D(Mtx param_0) {
-#if TARGET_PC
-    f32 scaleFactor = mDoGph_gInf_c::getHeight() / FB_HEIGHT;
-    GXSetViewport(0.0f, mViewOffsetY * scaleFactor, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), 0.0f, 1.0f);
-#else
     GXSetViewport(0.0f, mViewOffsetY, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f);
-#endif
     mViewOffsetY = -100.0f;
     Mtx44 projection;
     C_MTXPerspective(projection, 45.0f, mDoGph_gInf_c::getAspect(), 1.0f, 100000.0f);

src/d/d_menu_dmap.cpp

@@ -864,33 +864,15 @@ void dMenu_DmapBg_c::draw() {
     J2DOrthoGraph* grafContext = (J2DOrthoGraph*)dComIfGp_getCurrentGrafPort();
     grafContext->setup2D();
 
-#if TARGET_PC
-    // GXGetScissor uses 11-bit GC register fields (max 2047) which overflow
-    // at window widths > ~1705px, producing garbage values on restore.
-    scissor_left = 0;
-    scissor_top = 0;
-    scissor_width = (u32)mDoGph_gInf_c::getWidth();
-    scissor_height = (u32)mDoGph_gInf_c::getHeight();
-#else
     GXGetScissor(&scissor_left, &scissor_top, &scissor_width, &scissor_height);
-#endif
-#if TARGET_PC
-    grafContext->scissor(field_0xd94, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-#else
-        grafContext->scissor(field_0xd94, 0.0f, FB_WIDTH, FB_HEIGHT);
-#endif
+    grafContext->scissor(field_0xd94, 0.0f, FB_WIDTH, FB_HEIGHT);
     grafContext->setScissor();
 
     mBaseScreen->draw(field_0xd94, field_0xd98, grafContext);
     dMenu_Dmap_c::myclass->drawFloorScreenBack(mFloorScreen, field_0xd94, field_0xd98, grafContext);
 
-#if TARGET_PC
-    f32 dVar21 = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth();
-    f32 dVar16 = mDoGph_gInf_c::getHeightF() / mDoGph_gInf_c::getHeight();
-#else
     f32 dVar21 = mDoGph_gInf_c::getWidthF() / FB_WIDTH;
     f32 dVar16 = mDoGph_gInf_c::getHeightF() / FB_HEIGHT;
-#endif
     mMapScreen[0]->draw(field_0xd94, field_0xd98, grafContext);
 
     if (mpBackTexture != NULL) {
@@ -922,15 +904,9 @@ void dMenu_DmapBg_c::draw() {
         mpBackTexture->draw(local_28c, field_0xd94 + mpBackTexture->getBounds().i.y, mpBackTexture->getWidth(),
                             mpBackTexture->getHeight(), false, false, false);
 
-#if TARGET_PC
-        grafContext->scissor(field_0xd94,
-                             0, mDoGph_gInf_c::getWidth(),
-                             scissor_height);
-#else
         grafContext->scissor(field_0xd94 + mDoGph_gInf_c::getMinXF(),
                              scissor_top, mDoGph_gInf_c::getWidthF(),
                              scissor_height);
-#endif
         grafContext->setScissor();
     }
 
@@ -957,11 +933,7 @@ void dMenu_DmapBg_c::draw() {
 
     Vec local_26c = pane.getGlobalVtx(mMapPane, &local_110, 0, false, 0);
     drawIcon(local_26c.x + field_0xd94, local_26c.y, field_0xda8, 1.0f);
-#if TARGET_PC
-    grafContext->scissor(field_0xd94, scissor_top, mDoGph_gInf_c::getWidth(), scissor_height);
-#else
     grafContext->scissor(field_0xd94 + mDoGph_gInf_c::getMinXF(), scissor_top, mDoGph_gInf_c::getWidthF(), scissor_height);
-#endif
     grafContext->setScissor();
     grafContext->scissor(scissor_left, scissor_top, scissor_width, scissor_height);
     grafContext->setScissor();

src/d/d_menu_fmap2D.cpp

@@ -276,18 +276,14 @@ void dMenu_Fmap2DBack_c::draw() {
     u32 scissorLeft, scissorTop, scissorWidth, scissorHeight;
     GXGetScissor(&scissorLeft, &scissorTop, &scissorWidth, &scissorHeight);
 
-#if TARGET_PC
-    grafPort->scissor(mTransX, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-#else
     grafPort->scissor(mTransX, 0.0f, FB_WIDTH, FB_HEIGHT);
-#endif
     grafPort->setScissor();
 
     mpBackTex->setBlackWhite(field_0x1208, field_0x120c);
     mpBackTex->setAlpha(mAlphaRate * 255.0f * g_fmapHIO.mBackgroundAlpha);
     mpBackTex->draw(mTransX + mDoGph_gInf_c::getMinXF(),
-                    mTransZ + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidth(),
-                    mDoGph_gInf_c::getHeight(), false, false, false);
+                    mTransZ + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(),
+                    mDoGph_gInf_c::getHeightF(), false, false, false);
 
     mpBackScreen->draw(mTransX, mTransZ, grafPort);
     mpBaseScreen->draw(mTransX, mTransZ, grafPort);
@@ -297,13 +293,8 @@ void dMenu_Fmap2DBack_c::draw() {
 
     Vec vec2 = mpMapArea->getGlobalVtx(&mtx, 3, false, 0);
 
-#if TARGET_PC
-    f32 width = mDoGph_gInf_c::getWidthF() /  mDoGph_gInf_c::getWidth();
-    f32 height = mDoGph_gInf_c::getHeightF() / mDoGph_gInf_c::getHeight();
-#else
     f32 width = mDoGph_gInf_c::getWidthF() /  FB_WIDTH;
     f32 height = mDoGph_gInf_c::getHeightF() / FB_HEIGHT;
-#endif
 
     grafPort->scissor(mTransX + ((vec1.x - mDoGph_gInf_c::getMinXF()) / width),
                       mTransZ + (vec1.y / height), (vec2.x - vec1.x) / width,
@@ -360,11 +351,7 @@ void dMenu_Fmap2DBack_c::draw() {
         drawDebugRegionArea();
     }
 
-#if TARGET_PC
-    grafPort->scissor(scissorLeft, scissorTop, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-#else
     grafPort->scissor(scissorLeft, scissorTop, scissorWidth, scissorHeight);
-#endif
     grafPort->setScissor();
 
     if (isArrowDrawFlag()) {
@@ -2580,11 +2567,7 @@ void dMenu_Fmap2DTop_c::draw() {
     J2DOrthoGraph* ctx = static_cast<J2DOrthoGraph*>(dComIfGp_getCurrentGrafPort());
     ctx->setup2D();
     GXGetScissor(&scissor_left, &scissor_top, &scissor_width, &scissor_height);
-#if TARGET_PC
-    ctx->scissor(mTransX, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-#else
     ctx->scissor(mTransX, 0.0f, FB_WIDTH, FB_HEIGHT);
-#endif
     ctx->setScissor();
     mpTitleScreen->draw(mTransX, mTransY, ctx);
     ctx->scissor(scissor_left, scissor_top, scissor_width, scissor_height);

src/d/d_menu_letter.cpp

@@ -223,13 +223,8 @@ void dMenu_Letter_c::_draw() {
     f32 y1 = local_178.y;
     Vec local_184;
     local_184 = afStack_138.getGlobalVtx(field_0x1ec, &mtx, 3, false, 0);
-#if TARGET_PC
-    f32 dVar17 = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth();
-    f32 dVar16 = mDoGph_gInf_c::getHeightF() / mDoGph_gInf_c::getHeight();
-#else
     f32 dVar17 = mDoGph_gInf_c::getWidthF() / FB_WIDTH;
     f32 dVar16 = mDoGph_gInf_c::getHeightF() / FB_HEIGHT;
-#endif
     f32 fVar1 = (x1 - mDoGph_gInf_c::getMinXF()) / dVar17;
     f32 fVar2 = y1 / dVar16;
     grafContext->scissor(fVar1, fVar2,

src/d/d_menu_option.cpp

@@ -555,19 +555,11 @@ void dMenu_Option_c::_draw() {
         #endif
 
         mpBlackTex->setAlpha(0xff);
-#if TARGET_PC
-        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
-#else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
-#endif
         mpBackScreen->draw(0.0f, 0.0f, ctx);
         f32 alpha = (f32)g_drawHIO.mOptionScreen.mBackgroundAlpha * (f32)field_0x374;
         mpBlackTex->setAlpha(alpha);
-#if TARGET_PC
-        mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), 0, 0, 0);
-#else
         mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0);
-#endif
         mpScreen->draw(0.0f, 0.0f, ctx);
         mpClipScreen->draw(0.0f, 0.0f, ctx);
 #if TARGET_PC

src/d/d_menu_window.cpp

@@ -32,15 +32,9 @@ public:
         if (getDrawFlag() == 1) {
             setDrawFlag();
             dComIfGp_onPauseFlag();
-
-            #if TARGET_PC
-            GXSetTexCopySrc(0, 0, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-            #else
             GXSetTexCopySrc(0, 0, FB_WIDTH, FB_HEIGHT);
-            #endif
-
 #if TARGET_PC
-            GXSetTexCopyDst(mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_ENABLE);
+            GXSetTexCopyDst(FB_WIDTH, FB_HEIGHT, (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_DISABLE);
 #else
             GXSetTexCopyDst(FB_WIDTH / 2, FB_HEIGHT / 2, (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_ENABLE);
 #endif
@@ -48,17 +42,17 @@ public:
             GXPixModeSync();
 #if TARGET_PC
             // init mTexObj at capture time so the gpu ref survives window resizes
-            mCaptureWidth = mDoGph_gInf_c::getWidth();
-            mCaptureHeight = mDoGph_gInf_c::getHeight();
-            GXInitTexObj(&mTexObj, mDoGph_gInf_c::getFrameBufferTex(), mCaptureWidth, mCaptureHeight,
+            mCaptureWidth = JUTVideo::getManager()->getRenderWidth();
+            mCaptureHeight = JUTVideo::getManager()->getRenderHeight();
+            GXInitTexObj(&mTexObj, mDoGph_gInf_c::getFrameBufferTex(), FB_WIDTH / 2, FB_HEIGHT / 2,
                         (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_CLAMP, GX_CLAMP, GX_FALSE);
             GXInitTexObjLOD(&mTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
 #endif
         } else {
 #if TARGET_PC
             // If the window was resized since capture, force a re-capture at the new size
-            if (mCaptureWidth != (u16)mDoGph_gInf_c::getWidth() ||
-                mCaptureHeight != (u16)mDoGph_gInf_c::getHeight()) {
+            if (mCaptureWidth != JUTVideo::getManager()->getRenderWidth() ||
+                mCaptureHeight != JUTVideo::getManager()->getRenderHeight()) {
                 mFlag = 1;
                 return;
             }
@@ -137,8 +131,8 @@ private:
     /* 0x5 */ u8 mAlpha;
     /* 0x6 */ u8 mTopFlag;
 #if TARGET_PC
-    u16 mCaptureWidth;
-    u16 mCaptureHeight;
+    u32 mCaptureWidth;
+    u32 mCaptureHeight;
     TGXTexObj mTexObj;
 #endif
 };

src/d/d_msg_scrn_howl.cpp

@@ -607,17 +607,10 @@ void dMsgScrnHowl_c::drawGuide() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     Vec local_b0 = field_0x128;
     Vec local_bc = field_0x140;
-#if TARGET_PC
-    grafContext->scissor(
-        (local_b0.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth()),
-        field_0x2118, (local_bc.x - local_b0.x) / (mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth()),
-        field_0x2120);
-#else
     grafContext->scissor(
         (local_b0.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / FB_WIDTH),
         field_0x2118, (local_bc.x - local_b0.x) / (mDoGph_gInf_c::getWidthF() / FB_WIDTH),
         field_0x2120);
-#endif
     grafContext->setScissor();
     f32 local_cc = mpLineH[0]->getGlobalPosX();
     s16 sVar12 = 0;
@@ -745,19 +738,11 @@ void dMsgScrnHowl_c::drawGuide2() {
     }
     Vec local_58 = field_0x128;
     Vec local_64 = field_0x140;
-#if TARGET_PC
-    f32 local_70 = mDoGph_gInf_c::getHeightF() / mDoGph_gInf_c::getHeight();
-    grafContext->scissor(
-        (local_58.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth()),
-        field_0x2118, (local_64.x - local_58.x) / (mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth()),
-        field_0x2120);
-#else
     f32 local_70 = mDoGph_gInf_c::getHeightF() / mDoGph_gInf_c::getHeight();
     grafContext->scissor(
         (local_58.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / FB_WIDTH),
         field_0x2118, (local_64.x - local_58.x) / (mDoGph_gInf_c::getWidthF() / FB_WIDTH),
         field_0x2120);
-#endif
     grafContext->setScissor();
     f32 local_74 = mpLineH[0]->getGlobalPosX();
     s16 local_134 = 0;
@@ -859,15 +844,9 @@ void dMsgScrnHowl_c::drawEffect() {
     Vec vec1 = field_0x128;
     Vec vec2 = field_0x140;
     mDoGph_gInf_c::getHeightF();
-#if TARGET_PC
-    grafContext->scissor(
-        (vec1.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth()), field_0x2118,
-        12.0f + ((vec2.x - vec1.x) / (mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getWidth())), field_0x2120);
-#else
     grafContext->scissor(
         (vec1.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / FB_WIDTH), field_0x2118,
         12.0f + ((vec2.x - vec1.x) / (mDoGph_gInf_c::getWidthF() / FB_WIDTH)), field_0x2120);
-#endif
     grafContext->setScissor();
     u8 timer = daAlink_getAlinkActorClass()->getWolfHowlMgrP()->getReleaseTimer();
     u8 screenAlpha = mpScreen->search(MULTI_CHAR('line00'))->getAlpha();

src/d/d_ovlp_fade2.cpp

@@ -12,13 +12,8 @@
 #include "m_Do/m_Do_graphic.h"
 
 void dOvlpFd2_dlst_c::draw() {
-#if TARGET_PC
-    GXSetViewport(0.0f, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), 0.0f, 1.0f);
-    GXSetScissor(0, 0, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-#else
     GXSetViewport(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f);
     GXSetScissor(0, 0, FB_WIDTH, FB_HEIGHT);
-#endif
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGBA4, 0);
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);

src/d/d_ovlp_fade3.cpp

@@ -13,11 +13,10 @@
 #include "m_Do/m_Do_graphic.h"
 
 void dDlst_snapShot_c::draw() {
-#if TARGET_PC
-    GXSetTexCopySrc(0, 0, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-    GXSetTexCopyDst(mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), GX_TF_RGBA8, GX_TRUE);
-#else
     GXSetTexCopySrc(0, 0, FB_WIDTH, FB_HEIGHT);
+#if TARGET_PC
+    GXSetTexCopyDst(FB_WIDTH, FB_HEIGHT, GX_TF_RGBA8, GX_FALSE);
+#else
     GXSetTexCopyDst(FB_WIDTH / 2, FB_HEIGHT / 2, GX_TF_RGBA8, GX_TRUE);
 #endif
     GXCopyTex(mDoGph_gInf_c::getFrameBufferTex(), GX_FALSE);
@@ -25,13 +24,8 @@ void dDlst_snapShot_c::draw() {
 }
 
 void dOvlpFd3_dlst_c::draw() {
-#if TARGET_PC
-    GXSetViewport(0.0f, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), 0.0f, 1.0f);
-    GXSetScissor(0, 0, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight());
-#else
     GXSetViewport(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f);
     GXSetScissor(0, 0, FB_WIDTH, FB_HEIGHT);
-#endif
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGBA4, 0);
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -112,19 +106,6 @@ void dOvlpFd3_dlst_c::draw() {
 
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
 
-    #if TARGET_PC
-    GXPosition2s16(-FB_WIDTH / 2, FB_HEIGHT / 2);
-    GXTexCoord2s8(0, 0);
-
-    GXPosition2s16(FB_WIDTH / 2, FB_HEIGHT / 2);
-    GXTexCoord2s8(1, 0);
-
-    GXPosition2s16(FB_WIDTH / 2, -FB_HEIGHT / 2);
-    GXTexCoord2s8(1, 1);
-
-    GXPosition2s16(-FB_WIDTH / 2, -FB_HEIGHT / 2);
-    GXTexCoord2s8(0, 1);
-    #else
     GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, mDoGph_gInf_c::getHeight() / 2);
     GXTexCoord2s8(0, 0);
 
@@ -136,7 +117,6 @@ void dOvlpFd3_dlst_c::draw() {
 
     GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, -mDoGph_gInf_c::getHeight() / 2);
     GXTexCoord2s8(0, 1);
-    #endif
 
     GXEnd();
 

src/d/d_pane_class.cpp

@@ -356,12 +356,8 @@ Vec CPaneMgr::getGlobalVtx(J2DPane* p_pane, Mtx* param_1, u8 param_2, bool param
     Mtx m;
     MtxP mp = (MtxP)param_1;
     J2DPane* parent = p_pane->getParentPane();
-    
-#if TARGET_PC
-    J2DOrthoGraph ortho(0.0f, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), -1.0f, 1.0f);
-#else
+
     J2DOrthoGraph ortho(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, -1.0f, 1.0f);
-#endif
     ortho.setOrtho(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), -1.0f, 1.0f);
 
     if (parent != NULL) {

src/d/d_s_play.cpp

@@ -1418,12 +1418,7 @@ static int phase_4(dScnPly_c* i_this) {
         dComIfGp_setPlayerPtr(i, NULL);
     }
 
-#if TARGET_PC
-    dComIfGp_setWindow(0, 0.0f, 0.0f, mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), 0.0f,
-                       1.0f, 0, 2);
-#else
     dComIfGp_setWindow(0, 0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f, 0, 2);
-#endif
     dComIfGp_setCameraInfo(0, NULL, 0, 0, -1);
     dComIfGd_setWindow(NULL);
     dComIfGd_setViewport(NULL);