From eef74793f8bc8bfa310fb83969e67e2f078471a7 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sun, 6 Nov 2016 22:12:26 +0100 Subject: [PATCH 1/2] (WiiU) fix audio mix settings. --- audio/drivers/wiiu_audio.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/audio/drivers/wiiu_audio.c b/audio/drivers/wiiu_audio.c index 0754567ab7..c5a389d917 100644 --- a/audio/drivers/wiiu_audio.c +++ b/audio/drivers/wiiu_audio.c @@ -120,15 +120,15 @@ static void* ax_audio_init(const char* device, unsigned rate, unsigned latency) AXVoiceVeData ve = {0x4000, 0}; AXSetVoiceVe(ax->voice_l, &ve); AXSetVoiceVe(ax->voice_r, &ve); - AXVoiceDeviceMixData mix = {0}; - mix.bus[0].volume = 0x4000; - mix.bus[1].volume = 0x0000; - AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_DRC, 0, &mix); - AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_TV, 0, &mix); - mix.bus[0].volume = 0x0000; - mix.bus[1].volume = 0x4000; - AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_DRC, 0, &mix); - AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_TV, 0, &mix); + u32 mix[24]= {0}; + mix[0] = 0x80000000; + AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_DRC, 0, (AXVoiceDeviceMixData*)mix); + AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_TV, 0, (AXVoiceDeviceMixData*)mix); + mix[0] = 0; + mix[4] = 0x80000000; + AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_DRC, 0, (AXVoiceDeviceMixData*)mix); + AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_TV, 0, (AXVoiceDeviceMixData*)mix); + AXSetVoiceState(ax->voice_l, AX_VOICE_STATE_PLAYING); AXSetVoiceState(ax->voice_r, AX_VOICE_STATE_PLAYING); From 0de5019fab829b4ce1cf9d238b21b401f76ab9a5 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sun, 6 Nov 2016 22:13:07 +0100 Subject: [PATCH 2/2] (WiiU) clear textures on init. --- gfx/drivers/wiiu_gfx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gfx/drivers/wiiu_gfx.c b/gfx/drivers/wiiu_gfx.c index 238e840216..91ea1cfea3 100644 --- a/gfx/drivers/wiiu_gfx.c +++ b/gfx/drivers/wiiu_gfx.c @@ -273,7 +273,7 @@ static void* wiiu_gfx_init(const video_info_t* video, wiiu->texture.surface.image = MEM2_alloc(wiiu->texture.surface.imageSize, wiiu->texture.surface.alignment); - // memset(wiiu->texture.surface.image, 0x88, wiiu->texture.surface.imageSize); + memset(wiiu->texture.surface.image, 0x0, wiiu->texture.surface.imageSize); GX2Invalidate(GX2_INVALIDATE_MODE_CPU_TEXTURE, wiiu->texture.surface.image, wiiu->texture.surface.imageSize); @@ -293,10 +293,7 @@ static void* wiiu_gfx_init(const video_info_t* video, wiiu->menu.texture.surface.image = MEM2_alloc(wiiu->menu.texture.surface.imageSize, wiiu->menu.texture.surface.alignment); - for (i = 0; i < wiiu->menu.texture.surface.imageSize / 4; i++) - ((uint32_t*)wiiu->menu.texture.surface.image)[i] = 0xFFFFFFFF; - - ((uint32_t*)wiiu->menu.texture.surface.image)[0] = 0xFF0000FF; + memset(wiiu->menu.texture.surface.image, 0x0, wiiu->menu.texture.surface.imageSize); GX2Invalidate(GX2_INVALIDATE_MODE_CPU_TEXTURE, wiiu->menu.texture.surface.image, wiiu->menu.texture.surface.imageSize);