diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-01-14 15:03:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 10:03:13 +1100 |
| commit | 6412ddad50c687b007127f67e92382ec54611270 (patch) | |
| tree | b60cf30bf5c15b0c1a8a7259279901bc8de65ea8 /src/code/z_vimode.c | |
| parent | 663834cbc087ab7bbc9b20b48d6f06eaae4d4341 (diff) | |
General Cleanup (#1529)
* Cleanup
* vi define cleanup
* kdebugserver
* osmotor
* Remove sqrtf.c
* Move osFlash out of libultra
* PadUtils_Destroy
* BOOT_ADDRESS_ULTRA
* Fault
* Format
* viconfig.h
* More small cleanups
* gfx cleanup
* Format
* Forgot to save
* variables.h
* dListTable -> dListSides
* Fix header includes
Diffstat (limited to 'src/code/z_vimode.c')
| -rw-r--r-- | src/code/z_vimode.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index 8e3d1c59f..c7ed53626 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -77,9 +77,9 @@ void ViMode_Configure(OSViMode* viMode, s32 type, s32 tvType, s32 loRes, s32 ant yScaleHiOddField = modeF ? (loResInterlaced ? 0x3000000 : 0x2000000) : 0; viMode->type = type; - viMode->comRegs.ctrl = OS_VI_UNK2000 | OS_VI_UNK1000 | OS_VI_GAMMA | OS_VI_GAMMA_DITHER | - (!loResDeinterlaced ? OS_VI_UNK40 : 0) | (antialiasOn ? OS_VI_DIVOT : 0) | - (fb32Bit ? OS_VI_UNK2 | OS_VI_UNK1 : OS_VI_UNK2); + viMode->comRegs.ctrl = VI_CTRL_PIXEL_ADV_3 | VI_CTRL_GAMMA_ON | VI_CTRL_GAMMA_DITHER_ON | + (!loResDeinterlaced ? VI_CTRL_SERRATE_ON : 0) | (antialiasOn ? VI_CTRL_DIVOT_ON : 0) | + (fb32Bit ? VI_CTRL_TYPE_32 : VI_CTRL_TYPE_16); if (modeLAN1) { // Anti-aliased, fetch extra lines as-needed @@ -246,22 +246,22 @@ void ViMode_ConfigureFeatures(ViMode* viMode, s32 viFeatures) { u32 ctrl = viMode->customViMode.comRegs.ctrl; if (viFeatures & OS_VI_GAMMA_ON) { - ctrl |= OS_VI_GAMMA; + ctrl |= VI_CTRL_GAMMA_ON; } if (viFeatures & OS_VI_GAMMA_OFF) { - ctrl &= ~OS_VI_GAMMA; + ctrl &= ~VI_CTRL_GAMMA_ON; } if (viFeatures & OS_VI_GAMMA_DITHER_ON) { - ctrl |= OS_VI_GAMMA_DITHER; + ctrl |= VI_CTRL_GAMMA_DITHER_ON; } if (viFeatures & OS_VI_GAMMA_DITHER_OFF) { - ctrl &= ~OS_VI_GAMMA_DITHER; + ctrl &= ~VI_CTRL_GAMMA_DITHER_ON; } if (viFeatures & OS_VI_DIVOT_ON) { - ctrl |= OS_VI_DIVOT; + ctrl |= VI_CTRL_DIVOT_ON; } if (viFeatures & OS_VI_DIVOT_OFF) { - ctrl &= ~OS_VI_DIVOT; + ctrl &= ~VI_CTRL_DIVOT_ON; } viMode->customViMode.comRegs.ctrl = ctrl; } |