From f71e7b3dcc6282c9d22b8b0cef7691da1f9c5c40 Mon Sep 17 00:00:00 2001 From: jranderia3 <94210600+jranderia3@users.noreply.github.com> Date: Sun, 9 Jun 2024 21:57:11 -0400 Subject: [PATCH 1/6] square monitor support --- libraries/libwhb/src/gfx.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libraries/libwhb/src/gfx.c b/libraries/libwhb/src/gfx.c index 9ef62f165..df40574c0 100644 --- a/libraries/libwhb/src/gfx.c +++ b/libraries/libwhb/src/gfx.c @@ -1,5 +1,6 @@ #include "gfx_heap.h" +#include #include #include #include @@ -37,6 +38,9 @@ sDrcSurfaceFormat; static GX2TVRenderMode sTvRenderMode; +static AVMTvAspectRatio +sTvAspectRatio; + static void * sTvScanBuffer = NULL; @@ -310,14 +314,22 @@ WHBGfxInit() sDrcRenderMode = GX2GetSystemDRCMode(); sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; - + + AVMSetTVAspectRatio(sTvAspectRatio); switch(GX2GetSystemTVScanMode()) { case GX2_TV_SCAN_MODE_480I: case GX2_TV_SCAN_MODE_480P: - sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_480P; - tvWidth = 854; - tvHeight = 480; + if (sTvAspectRatio == AVM_TV_ASPECT_RATIO_16_9) { + sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_480P; + tvWidth = 854; + tvHeight = 480; + } else { + sTvRenderMode = GX2_TV_RENDER_MODE_STANDARD_480P; + tvWidth = 640; + tvHeight = 480; + } + break; case GX2_TV_SCAN_MODE_1080I: case GX2_TV_SCAN_MODE_1080P: From 1f10cbda0fa1b5a984ba366148edf957ad134396 Mon Sep 17 00:00:00 2001 From: jranderia3 <94210600+jranderia3@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:47:43 -0400 Subject: [PATCH 2/6] Update gfx.c Fix typo --- libraries/libwhb/src/gfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/libwhb/src/gfx.c b/libraries/libwhb/src/gfx.c index df40574c0..00567a618 100644 --- a/libraries/libwhb/src/gfx.c +++ b/libraries/libwhb/src/gfx.c @@ -315,7 +315,7 @@ WHBGfxInit() sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; - AVMSetTVAspectRatio(sTvAspectRatio); + AVMGetTVAspectRatio(sTvAspectRatio); switch(GX2GetSystemTVScanMode()) { case GX2_TV_SCAN_MODE_480I: From c107174bad2aa78dcd1c3392948577f0d365bfc0 Mon Sep 17 00:00:00 2001 From: jranderia3 <94210600+jranderia3@users.noreply.github.com> Date: Tue, 11 Jun 2024 20:36:31 -0400 Subject: [PATCH 3/6] do it using gx2 instead of avm --- libraries/libwhb/src/gfx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/libwhb/src/gfx.c b/libraries/libwhb/src/gfx.c index 00567a618..6c1fece91 100644 --- a/libraries/libwhb/src/gfx.c +++ b/libraries/libwhb/src/gfx.c @@ -1,6 +1,5 @@ #include "gfx_heap.h" -#include #include #include #include @@ -38,8 +37,6 @@ sDrcSurfaceFormat; static GX2TVRenderMode sTvRenderMode; -static AVMTvAspectRatio -sTvAspectRatio; static void * sTvScanBuffer = NULL; @@ -315,12 +312,12 @@ WHBGfxInit() sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; - AVMGetTVAspectRatio(sTvAspectRatio); + switch(GX2GetSystemTVScanMode()) { case GX2_TV_SCAN_MODE_480I: case GX2_TV_SCAN_MODE_480P: - if (sTvAspectRatio == AVM_TV_ASPECT_RATIO_16_9) { + if (GX2GetSystemTVAspectRatio() == GX2_ASPECT_RATIO_16_9) { sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_480P; tvWidth = 854; tvHeight = 480; From 9e83ead781d7d96c33ef9ddf3e53f2910aec3a0c Mon Sep 17 00:00:00 2001 From: jranderia3 <94210600+jranderia3@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:37:07 -0400 Subject: [PATCH 4/6] Update gfx.c remove some newlines --- libraries/libwhb/src/gfx.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/libwhb/src/gfx.c b/libraries/libwhb/src/gfx.c index 6c1fece91..9e85a1d2c 100644 --- a/libraries/libwhb/src/gfx.c +++ b/libraries/libwhb/src/gfx.c @@ -37,7 +37,6 @@ sDrcSurfaceFormat; static GX2TVRenderMode sTvRenderMode; - static void * sTvScanBuffer = NULL; @@ -311,8 +310,6 @@ WHBGfxInit() sDrcRenderMode = GX2GetSystemDRCMode(); sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; - - switch(GX2GetSystemTVScanMode()) { case GX2_TV_SCAN_MODE_480I: @@ -326,7 +323,6 @@ WHBGfxInit() tvWidth = 640; tvHeight = 480; } - break; case GX2_TV_SCAN_MODE_1080I: case GX2_TV_SCAN_MODE_1080P: From d77935ff4be29fe395c7fd0f442c148f13b6d0bc Mon Sep 17 00:00:00 2001 From: jranderia3 <94210600+jranderia3@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:23:21 -0400 Subject: [PATCH 5/6] Update gfx.c newline fix --- libraries/libwhb/src/gfx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/libwhb/src/gfx.c b/libraries/libwhb/src/gfx.c index 9e85a1d2c..9d27d5ae1 100644 --- a/libraries/libwhb/src/gfx.c +++ b/libraries/libwhb/src/gfx.c @@ -310,6 +310,7 @@ WHBGfxInit() sDrcRenderMode = GX2GetSystemDRCMode(); sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; + switch(GX2GetSystemTVScanMode()) { case GX2_TV_SCAN_MODE_480I: From 4fafa076d16114dcc170f292dceeaf4887bd04c4 Mon Sep 17 00:00:00 2001 From: jranderia3 <94210600+jranderia3@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:24:22 -0400 Subject: [PATCH 6/6] Update gfx.c --- libraries/libwhb/src/gfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/libwhb/src/gfx.c b/libraries/libwhb/src/gfx.c index 9d27d5ae1..e1fcf27a3 100644 --- a/libraries/libwhb/src/gfx.c +++ b/libraries/libwhb/src/gfx.c @@ -310,7 +310,7 @@ WHBGfxInit() sDrcRenderMode = GX2GetSystemDRCMode(); sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; - + switch(GX2GetSystemTVScanMode()) { case GX2_TV_SCAN_MODE_480I: