From 504ba8d82447f3ac93e04c7fc24a41623d6f0be7 Mon Sep 17 00:00:00 2001 From: Eladash Date: Fri, 10 Apr 2020 23:09:13 +0300 Subject: [PATCH] rsx: Fix grammer issue (binded -> bound) --- rpcs3/Emu/Cell/Modules/cellGcmSys.cpp | 12 ++++++------ rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 18 +++++++++--------- rpcs3/Emu/RSX/Capture/rsx_capture.cpp | 8 ++++---- rpcs3/Emu/RSX/GCM.h | 4 ++-- rpcs3/Emu/RSX/GL/GLHelpers.cpp | 6 +++--- rpcs3/Emu/RSX/GL/GLHelpers.h | 6 +++--- rpcs3/Emu/RSX/RSXThread.cpp | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp index 18fa2ac21a..5b9d91b29c 100644 --- a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp @@ -266,7 +266,7 @@ error_code cellGcmBindTile(u8 index) return CELL_GCM_ERROR_INVALID_VALUE; } - rsx::get_current_renderer()->tiles[index].binded = true; + rsx::get_current_renderer()->tiles[index].bound = true; return CELL_OK; } @@ -281,7 +281,7 @@ error_code cellGcmBindZcull(u8 index, u32 offset, u32 width, u32 height, u32 cul return CELL_GCM_ERROR_INVALID_VALUE; } - rsx::get_current_renderer()->zculls[index].binded = true; + rsx::get_current_renderer()->zculls[index].bound = true; return CELL_OK; } @@ -701,7 +701,7 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, zcull.sFunc = sFunc; zcull.sRef = sRef; zcull.sMask = sMask; - zcull.binded = (zCullFormat > 0); + zcull.bound = (zCullFormat > 0); vm::_ptr(gcm_cfg->zculls_addr)[index] = zcull.pack(); } @@ -715,7 +715,7 @@ error_code cellGcmUnbindTile(u8 index) return CELL_GCM_ERROR_INVALID_VALUE; } - rsx::get_current_renderer()->tiles[index].binded = false; + rsx::get_current_renderer()->tiles[index].bound = false; return CELL_OK; } @@ -729,7 +729,7 @@ error_code cellGcmUnbindZcull(u8 index) return CELL_GCM_ERROR_INVALID_VALUE; } - rsx::get_current_renderer()->zculls[index].binded = false; + rsx::get_current_renderer()->zculls[index].bound = false; return CELL_OK; } @@ -1301,7 +1301,7 @@ error_code cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch tile.comp = comp; tile.base = base; tile.bank = bank; - tile.binded = (pitch > 0); + tile.bound = (pitch > 0); vm::_ptr(gcm_cfg->tiles_addr)[index] = tile.pack(); return CELL_OK; diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index bd38a4a95c..cf477597ea 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -573,11 +573,11 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64 const u32 comp = ((a5 & 0xFFFFFFFF) >> 26) & 0xF; const u32 base = (a5 & 0xFFFFFFFF) & 0x7FF; const u32 bank = (((a4 >> 32) & 0xFFFFFFFF) >> 4) & 0xF; - const bool binded = ((a4 >> 32) & 0x3) != 0; + const bool bound = ((a4 >> 32) & 0x3) != 0; const auto range = utils::address_range::start_length(offset, size); - if (binded) + if (bound) { if (!size || !pitch) { @@ -604,12 +604,12 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64 std::lock_guard lock(s_rsxmem_mtx); - // When tile is going to be unbinded, we can use it as a hint that the address will no longer be used as a surface and can be removed/invalidated + // When tile is going to be unbound, we can use it as a hint that the address will no longer be used as a surface and can be removed/invalidated // Todo: There may be more checks such as format/size/width can could be done - if (tile.binded && !binded) + if (tile.bound && !bound) render->notify_tile_unbound(static_cast(a3)); - if (location == CELL_GCM_LOCATION_MAIN && binded) + if (location == CELL_GCM_LOCATION_MAIN && bound) { vm::reader_lock rlock; @@ -629,7 +629,7 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64 tile.comp = comp; tile.base = base; tile.bank = base; - tile.binded = binded; + tile.bound = bound; } break; @@ -650,9 +650,9 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64 } const u32 offset = (a5 & 0xFFFFFFFF); - const bool binded = (a6 & 0xFFFFFFFF) != 0; + const bool bound = (a6 & 0xFFFFFFFF) != 0; - if (binded) + if (bound) { if (offset >= render->local_mem_size) { @@ -678,7 +678,7 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64 zcull.sFunc = ((a6 >> 32) >> 12) & 0xF; zcull.sRef = ((a6 >> 32) >> 16) & 0xFF; zcull.sMask = ((a6 >> 32) >> 24) & 0xFF; - zcull.binded = binded; + zcull.bound = bound; } break; diff --git a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp index af1082824b..c0bfe5afad 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp +++ b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp @@ -371,8 +371,8 @@ namespace rsx auto& tstate = tilestate.tiles[i]; tstate.tile = tile.tile; tstate.limit = tile.limit; - tstate.pitch = rsx->tiles[i].binded ? u32{tile.pitch} : 0; - tstate.format = rsx->tiles[i].binded ? u32{tile.format} : 0; + tstate.pitch = rsx->tiles[i].bound ? u32{tile.pitch} : 0; + tstate.format = rsx->tiles[i].bound ? u32{tile.format} : 0; } for (u32 i = 0; i < limits::zculls_count; ++i) @@ -383,8 +383,8 @@ namespace rsx zcstate.size = zc.size; zcstate.start = zc.start; zcstate.offset = zc.offset; - zcstate.status0 = rsx->zculls[i].binded ? u32{zc.status0} : 0; - zcstate.status1 = rsx->zculls[i].binded ? u32{zc.status1} : 0; + zcstate.status0 = rsx->zculls[i].bound ? u32{zc.status0} : 0; + zcstate.status1 = rsx->zculls[i].bound ? u32{zc.status1} : 0; } const u64 tsnum = XXH64(&tilestate, sizeof(frame_capture_data::tile_state), 0); diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h index 81d1629dad..7ba11e5413 100644 --- a/rpcs3/Emu/RSX/GCM.h +++ b/rpcs3/Emu/RSX/GCM.h @@ -111,7 +111,7 @@ struct GcmZcullInfo u32 sFunc; u32 sRef; u32 sMask; - bool binded = false; + bool bound = false; CellGcmZcullInfo pack() const { @@ -137,7 +137,7 @@ struct GcmTileInfo u32 comp; u32 base; u32 bank; - bool binded = false; + bool bound = false; CellGcmTileInfo pack() const { diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.cpp b/rpcs3/Emu/RSX/GL/GLHelpers.cpp index 9fb537e0bd..709b07f2c9 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.cpp +++ b/rpcs3/Emu/RSX/GL/GLHelpers.cpp @@ -291,7 +291,7 @@ namespace gl glReadPixels(coord.x, coord.y, coord.width, coord.height, static_cast(format_), static_cast(type_), nullptr); } - fbo fbo::get_binded_draw_buffer() + fbo fbo::get_bound_draw_buffer() { GLint value; glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &value); @@ -299,7 +299,7 @@ namespace gl return{ static_cast(value) }; } - fbo fbo::get_binded_read_buffer() + fbo fbo::get_bound_read_buffer() { GLint value; glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &value); @@ -307,7 +307,7 @@ namespace gl return{ static_cast(value) }; } - fbo fbo::get_binded_buffer() + fbo fbo::get_bound_buffer() { GLint value; glGetIntegerv(GL_FRAMEBUFFER_BINDING, &value); diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h index 16f4aceb64..43895806f6 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.h +++ b/rpcs3/Emu/RSX/GL/GLHelpers.h @@ -2382,9 +2382,9 @@ public: void copy_to(void* pixels, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings = pixel_pack_settings()) const; void copy_to(const buffer& buf, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings = pixel_pack_settings()) const; - static fbo get_binded_draw_buffer(); - static fbo get_binded_read_buffer(); - static fbo get_binded_buffer(); + static fbo get_bound_draw_buffer(); + static fbo get_bound_read_buffer(); + static fbo get_bound_buffer(); GLuint id() const; void set_id(GLuint id); diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index b44f6543db..06b378ce87 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -1771,7 +1771,7 @@ namespace rsx { for (GcmTileInfo &tile : tiles) { - if (!tile.binded || (tile.location & 1) != (location & 1)) + if (!tile.bound || (tile.location & 1) != (location & 1)) { continue; } @@ -2136,7 +2136,7 @@ namespace rsx //Find zeta address in bound zculls for (const auto& zcull : zculls) { - if (zcull.binded) + if (zcull.bound) { const u32 rsx_address = rsx::get_address(zcull.offset, CELL_GCM_LOCATION_LOCAL, HERE); if (rsx_address == zeta_address)