archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 18:28:35 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rsx: Fix grammer issue (binded -> bound)

Browse source
This commit is contained in:
Eladash 2020-04-10 23:09:13 +03:00 • committed by kd-11
parent 8228fa1ece
commit 504ba8d824
7 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
View file

@ -266,7 +266,7 @@ error_code cellGcmBindTile(u8 index)
return CELL_GCM_ERROR_INVALID_VALUE; 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; 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; 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; return CELL_OK;
} }
@ -701,7 +701,7 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
zcull.sFunc = sFunc; zcull.sFunc = sFunc;
zcull.sRef = sRef; zcull.sRef = sRef;
zcull.sMask = sMask; zcull.sMask = sMask;
zcull.binded = (zCullFormat > 0); zcull.bound = (zCullFormat > 0);
vm::_ptr<CellGcmZcullInfo>(gcm_cfg->zculls_addr)[index] = zcull.pack(); vm::_ptr<CellGcmZcullInfo>(gcm_cfg->zculls_addr)[index] = zcull.pack();
} }
@ -715,7 +715,7 @@ error_code cellGcmUnbindTile(u8 index)
return CELL_GCM_ERROR_INVALID_VALUE; 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; return CELL_OK;
} }
@ -729,7 +729,7 @@ error_code cellGcmUnbindZcull(u8 index)
return CELL_GCM_ERROR_INVALID_VALUE; 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; return CELL_OK;
} }
@ -1301,7 +1301,7 @@ error_code cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch
tile.comp = comp; tile.comp = comp;
tile.base = base; tile.base = base;
tile.bank = bank; tile.bank = bank;
tile.binded = (pitch > 0); tile.bound = (pitch > 0);
vm::_ptr<CellGcmTileInfo>(gcm_cfg->tiles_addr)[index] = tile.pack(); vm::_ptr<CellGcmTileInfo>(gcm_cfg->tiles_addr)[index] = tile.pack();
return CELL_OK; return CELL_OK;

18
rpcs3/Emu/Cell/lv2/sys_rsx.cpp
View file

@ -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 comp = ((a5 & 0xFFFFFFFF) >> 26) & 0xF;
const u32 base = (a5 & 0xFFFFFFFF) & 0x7FF; const u32 base = (a5 & 0xFFFFFFFF) & 0x7FF;
const u32 bank = (((a4 >> 32) & 0xFFFFFFFF) >> 4) & 0xF; 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); const auto range = utils::address_range::start_length(offset, size);
if (binded) if (bound)
{ {
if (!size || !pitch) 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); 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 // 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<u32>(a3)); render->notify_tile_unbound(static_cast<u32>(a3));
if (location == CELL_GCM_LOCATION_MAIN && binded) if (location == CELL_GCM_LOCATION_MAIN && bound)
{ {
vm::reader_lock rlock; 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.comp = comp;
tile.base = base; tile.base = base;
tile.bank = base; tile.bank = base;
tile.binded = binded; tile.bound = bound;
} }
break; 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 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) 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.sFunc = ((a6 >> 32) >> 12) & 0xF;
zcull.sRef = ((a6 >> 32) >> 16) & 0xFF; zcull.sRef = ((a6 >> 32) >> 16) & 0xFF;
zcull.sMask = ((a6 >> 32) >> 24) & 0xFF; zcull.sMask = ((a6 >> 32) >> 24) & 0xFF;
zcull.binded = binded; zcull.bound = bound;
} }
break; break;

8
rpcs3/Emu/RSX/Capture/rsx_capture.cpp
View file

@ -371,8 +371,8 @@ namespace rsx
auto& tstate = tilestate.tiles[i]; auto& tstate = tilestate.tiles[i];
tstate.tile = tile.tile; tstate.tile = tile.tile;
tstate.limit = tile.limit; tstate.limit = tile.limit;
tstate.pitch = rsx->tiles[i].binded ? u32{tile.pitch} : 0; tstate.pitch = rsx->tiles[i].bound ? u32{tile.pitch} : 0;
tstate.format = rsx->tiles[i].binded ? u32{tile.format} : 0; tstate.format = rsx->tiles[i].bound ? u32{tile.format} : 0;
} }
for (u32 i = 0; i < limits::zculls_count; ++i) for (u32 i = 0; i < limits::zculls_count; ++i)
@ -383,8 +383,8 @@ namespace rsx
zcstate.size = zc.size; zcstate.size = zc.size;
zcstate.start = zc.start; zcstate.start = zc.start;
zcstate.offset = zc.offset; zcstate.offset = zc.offset;
zcstate.status0 = rsx->zculls[i].binded ? u32{zc.status0} : 0; zcstate.status0 = rsx->zculls[i].bound ? u32{zc.status0} : 0;
zcstate.status1 = rsx->zculls[i].binded ? u32{zc.status1} : 0; zcstate.status1 = rsx->zculls[i].bound ? u32{zc.status1} : 0;
} }
const u64 tsnum = XXH64(&tilestate, sizeof(frame_capture_data::tile_state), 0); const u64 tsnum = XXH64(&tilestate, sizeof(frame_capture_data::tile_state), 0);

4
rpcs3/Emu/RSX/GCM.h
View file

@ -111,7 +111,7 @@ struct GcmZcullInfo
u32 sFunc; u32 sFunc;
u32 sRef; u32 sRef;
u32 sMask; u32 sMask;
bool binded = false; bool bound = false;
CellGcmZcullInfo pack() const CellGcmZcullInfo pack() const
{ {
@ -137,7 +137,7 @@ struct GcmTileInfo
u32 comp; u32 comp;
u32 base; u32 base;
u32 bank; u32 bank;
bool binded = false; bool bound = false;
CellGcmTileInfo pack() const CellGcmTileInfo pack() const
{ {

6
rpcs3/Emu/RSX/GL/GLHelpers.cpp
View file

@ -291,7 +291,7 @@ namespace gl
glReadPixels(coord.x, coord.y, coord.width, coord.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), nullptr); glReadPixels(coord.x, coord.y, coord.width, coord.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), nullptr);
} }
fbo fbo::get_binded_draw_buffer() fbo fbo::get_bound_draw_buffer()
{ {
GLint value; GLint value;
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &value); glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &value);
@ -299,7 +299,7 @@ namespace gl
return{ static_cast<GLuint>(value) }; return{ static_cast<GLuint>(value) };
} }
fbo fbo::get_binded_read_buffer() fbo fbo::get_bound_read_buffer()
{ {
GLint value; GLint value;
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &value); glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &value);
@ -307,7 +307,7 @@ namespace gl
return{ static_cast<GLuint>(value) }; return{ static_cast<GLuint>(value) };
} }
fbo fbo::get_binded_buffer() fbo fbo::get_bound_buffer()
{ {
GLint value; GLint value;
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &value); glGetIntegerv(GL_FRAMEBUFFER_BINDING, &value);

6
rpcs3/Emu/RSX/GL/GLHelpers.h
View file

@ -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(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; 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_bound_draw_buffer();
static fbo get_binded_read_buffer(); static fbo get_bound_read_buffer();
static fbo get_binded_buffer(); static fbo get_bound_buffer();
GLuint id() const; GLuint id() const;
void set_id(GLuint id); void set_id(GLuint id);

4
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -1771,7 +1771,7 @@ namespace rsx
{ {
for (GcmTileInfo &tile : tiles) for (GcmTileInfo &tile : tiles)
{ {
if (!tile.binded || (tile.location & 1) != (location & 1)) if (!tile.bound || (tile.location & 1) != (location & 1))
{ {
continue; continue;
} }
@ -2136,7 +2136,7 @@ namespace rsx
//Find zeta address in bound zculls //Find zeta address in bound zculls
for (const auto& zcull : 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); const u32 rsx_address = rsx::get_address(zcull.offset, CELL_GCM_LOCATION_LOCAL, HERE);
if (rsx_address == zeta_address) if (rsx_address == zeta_address)