The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2025-02-17 12:36:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

-finally removed this ugly __real_memalign from the video.cpp,

Browse Source 
looks better now :P
This commit is contained in:
fix94.1 2012-05-07 19:57:37 +00:00
parent 73e34da188
commit 615000728d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/gui/video.cpp
View File

@ -64,11 +64,6 @@ const int CVideo::_stencilHeight = 128;
static lwp_t waitThread = LWP_THREAD_NULL; static lwp_t waitThread = LWP_THREAD_NULL;
SmartBuf waitThreadStack; SmartBuf waitThreadStack;
extern "C"
{
extern __typeof(memalign) __real_memalign;
}
CVideo::CVideo(void) : CVideo::CVideo(void) :
m_rmode(NULL), m_frameBuf(), m_curFB(0), m_fifo(NULL), m_rmode(NULL), m_frameBuf(), m_curFB(0), m_fifo(NULL),
m_yScale(0.0f), m_xfbHeight(0), m_wide(false), m_yScale(0.0f), m_xfbHeight(0), m_wide(false),
@ -150,7 +145,7 @@ void CVideo::init(void)
VIDEO_WaitVSync(); VIDEO_WaitVSync();
if (m_rmode->viTVMode & VI_NON_INTERLACE) if (m_rmode->viTVMode & VI_NON_INTERLACE)
VIDEO_WaitVSync(); VIDEO_WaitVSync();
m_fifo = __real_memalign(32, DEFAULT_FIFO_SIZE); m_fifo = MEM1_memalign(32, DEFAULT_FIFO_SIZE);
memset(m_fifo, 0, DEFAULT_FIFO_SIZE); memset(m_fifo, 0, DEFAULT_FIFO_SIZE);
GX_Init(m_fifo, DEFAULT_FIFO_SIZE); GX_Init(m_fifo, DEFAULT_FIFO_SIZE);
GX_SetCopyClear(CColor(0), 0x00FFFFFF); GX_SetCopyClear(CColor(0), 0x00FFFFFF);
@ -234,7 +229,7 @@ void CVideo::cleanup(void)
SMART_FREE(m_aaBuffer[i]); SMART_FREE(m_aaBuffer[i]);
m_aaBufferSize[i] = 0; m_aaBufferSize[i] = 0;
} }
SAFE_FREE(m_fifo); MEM1_free(m_fifo);
} }
void CVideo::prepareAAPass(int aaStep) void CVideo::prepareAAPass(int aaStep)

6
source/memory/mem2.cpp
View File

@ -35,6 +35,11 @@ void *MEM1_alloc(unsigned int s)
return __real_malloc(s); return __real_malloc(s);
} }
void *MEM1_memalign(unsigned int a, unsigned int s)
{
return __real_memalign(a, s);
}
void *MEM1_realloc(void *p, unsigned int s) void *MEM1_realloc(void *p, unsigned int s)
{ {
return __real_realloc(p, s); return __real_realloc(p, s);
@ -45,7 +50,6 @@ void MEM1_free(void *p)
__real_free(p); __real_free(p);
} }
void MEM2_init(unsigned int mem2Size) void MEM2_init(unsigned int mem2Size)
{ {
if(&_end + 0x100 > APPLOADER_START) if(&_end + 0x100 > APPLOADER_START)

1
source/memory/mem2.hpp
View File

@ -13,6 +13,7 @@ extern "C"
#define MEM2_PRIORITY_SIZE 0x1000 #define MEM2_PRIORITY_SIZE 0x1000
void *MEM1_alloc(unsigned int s); void *MEM1_alloc(unsigned int s);
void *MEM1_memalign(unsigned int a, unsigned int s);
void *MEM1_realloc(void *p, unsigned int s); void *MEM1_realloc(void *p, unsigned int s);
void MEM1_free(void *p); void MEM1_free(void *p);