diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp index 832afe2b4..8ebf3cbc8 100644 --- a/Source/Glide64/Main.cpp +++ b/Source/Glide64/Main.cpp @@ -902,7 +902,7 @@ int InitGfx() /*if (fb_hwfbe_enabled) { - gfx_context = grSstWinOpenExt (wxPtrToUInt(gfx.hWnd), + gfx_context = grSstWinOpenExt (uintptr_t(gfx.hWnd), res_data, GR_REFRESH_60Hz, GR_COLORFORMAT_RGBA, diff --git a/Source/Glide64/TexCache.cpp b/Source/Glide64/TexCache.cpp index 8594760af..aea1d2d83 100644 --- a/Source/Glide64/TexCache.cpp +++ b/Source/Glide64/TexCache.cpp @@ -379,7 +379,7 @@ void GetTexInfo(int id, int tile) else { crc = 0xFFFFFFFF; - wxUIntPtr addr = wxPtrToUInt(rdp.tmem) + (rdp.tiles[tile].t_mem << 3); + wxUIntPtr addr = uintptr_t(rdp.tmem) + (rdp.tiles[tile].t_mem << 3); uint32_t line2 = maxval(line, 1); if (rdp.tiles[tile].size < 3) { @@ -1069,7 +1069,7 @@ void LoadTex(int id, int tmu) #endif // Add this cache to the list - AddToList(&cachelut[cache->crc >> 16], cache->crc, wxPtrToUInt(cache), tmu, rdp.n_cached[tmu]); + AddToList(&cachelut[cache->crc >> 16], cache->crc, uintptr_t(cache), tmu, rdp.n_cached[tmu]); // temporary cache->t_info.format = GR_TEXFMT_ARGB_1555; @@ -1385,7 +1385,7 @@ void LoadTex(int id, int tmu) start_src >>= 1; result = load_table[rdp.tiles[td].size][rdp.tiles[td].format] - (wxPtrToUInt(texture) + start_dst, wxPtrToUInt(rdp.tmem) + (rdp.tiles[td].t_mem << 3) + start_src, + (uintptr_t(texture) + start_dst, uintptr_t(rdp.tmem) + (rdp.tiles[td].t_mem << 3) + start_src, texinfo[id].wid_64, texinfo[id].height, texinfo[id].line, real_x, td); uint32_t size = HIWORD(result); @@ -1402,7 +1402,7 @@ void LoadTex(int id, int tmu) else { result = load_table[rdp.tiles[td].size][rdp.tiles[td].format] - (wxPtrToUInt(texture), wxPtrToUInt(rdp.tmem) + (rdp.tiles[td].t_mem << 3), + (uintptr_t(texture), uintptr_t(rdp.tmem) + (rdp.tiles[td].t_mem << 3), texinfo[id].wid_64, texinfo[id].height, texinfo[id].line, real_x, td); uint32_t size = HIWORD(result); diff --git a/Source/Glide64/TexLoad4b.h b/Source/Glide64/TexLoad4b.h index 2d44bbe0d..bc360a0e0 100644 --- a/Source/Glide64/TexLoad4b.h +++ b/Source/Glide64/TexLoad4b.h @@ -604,7 +604,7 @@ uint32_t Load4bCI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44; } - wxUIntPtr pal = wxPtrToUInt(rdp.pal_8 + (rdp.tiles[tile].palette << 4)); + wxUIntPtr pal = uintptr_t(rdp.pal_8 + (rdp.tiles[tile].palette << 4)); if (rdp.tlut_mode == 2) { ext <<= 1; diff --git a/Source/Glide64/rdp.cpp b/Source/Glide64/rdp.cpp index 2208d006d..ff32ce08d 100644 --- a/Source/Glide64/rdp.cpp +++ b/Source/Glide64/rdp.cpp @@ -3333,7 +3333,7 @@ void DetectFrameBufferUsage() // Go to the next instruction rdp.pc[rdp.pc_i] = (a + 8) & BMASK; - if (wxPtrToUInt(reinterpret_cast(gfx_instruction_lite[settings.ucode][rdp.cmd0 >> 24]))) + if (uintptr_t(reinterpret_cast(gfx_instruction_lite[settings.ucode][rdp.cmd0 >> 24]))) gfx_instruction_lite[settings.ucode][rdp.cmd0 >> 24](); // check DL counter