Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
kd-11
2017-03-16 15:22:23 +03:00
parent b6fd878834
commit e7271179f7
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/GL/GLTextureCache.h
+14 -3
View File
@@ -17,6 +17,9 @@
class GLGSRender; class GLGSRender;
extern cfg::bool_entry g_cfg_rsx_write_color_buffers;
extern cfg::bool_entry g_cfg_rsx_write_depth_buffer;
namespace gl namespace gl
{ {
class texture_cache class texture_cache
@@ -542,7 +545,7 @@ namespace gl
auto test = std::make_pair(texaddr, range); auto test = std::make_pair(texaddr, range);
for (cached_texture_section &tex : m_texture_cache) for (cached_texture_section &tex : m_texture_cache)
{ {
if (tex.overlaps(test) && !tex.is_dirty()) if (tex.overlaps(test, true) && !tex.is_dirty())
return &tex; return &tex;
} }
@@ -847,6 +850,7 @@ namespace gl
u32 texture_id = create_temporary_subresource(cached_texture->id(), ifmt, offset_x, offset_y, tex.width(), tex.height()); u32 texture_id = create_temporary_subresource(cached_texture->id(), ifmt, offset_x, offset_y, tex.width(), tex.height());
if (texture_id) return; if (texture_id) return;
} }
else else
LOG_ERROR(RSX, "Broken cache overlap search"); LOG_ERROR(RSX, "Broken cache overlap search");
@@ -1055,11 +1059,18 @@ namespace gl
GLenum src_gl_format = src_is_argb8 ? GL_BGRA : GL_RGB; GLenum src_gl_format = src_is_argb8 ? GL_BGRA : GL_RGB;
GLenum src_gl_type = src_is_argb8? GL_UNSIGNED_INT_8_8_8_8: GL_UNSIGNED_SHORT_5_6_5; GLenum src_gl_type = src_is_argb8? GL_UNSIGNED_INT_8_8_8_8: GL_UNSIGNED_SHORT_5_6_5;
if (g_cfg_rsx_write_color_buffers || g_cfg_rsx_write_depth_buffer)
{
//Invalidate source if we are blitting from an RTT
flush_section((u32)((u64)src.pixels - (u64)vm::base(0)));
}
glGenTextures(1, &tmp_tex); glGenTextures(1, &tmp_tex);
glBindTexture(GL_TEXTURE_2D, tmp_tex); glBindTexture(GL_TEXTURE_2D, tmp_tex);
glPixelStorei(GL_UNPACK_ROW_LENGTH, src.pitch / (src_is_argb8? 4: 2));
glPixelStorei(GL_UNPACK_SWAP_BYTES, !src_is_argb8);
glTexStorage2D(GL_TEXTURE_2D, 1, src_gl_sized_format, src.width, src.slice_h); glTexStorage2D(GL_TEXTURE_2D, 1, src_gl_sized_format, src.width, src.slice_h);
glPixelStorei(GL_UNPACK_ROW_LENGTH, src.pitch / (src_is_argb8? 4: 2));
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glPixelStorei(GL_UNPACK_SWAP_BYTES, !src_is_argb8);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, src.width, src.slice_h, src_gl_format, src_gl_type, src.pixels); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, src.width, src.slice_h, src_gl_format, src_gl_type, src.pixels);
rpcs3/Emu/RSX/rsx_cache.h
+13
View File
@@ -177,6 +177,19 @@ namespace rsx
return (locked_address_base <= address && (address - locked_address_base) < locked_address_range); return (locked_address_base <= address && (address - locked_address_base) < locked_address_range);
} }
/**
* Check if range overlaps with this section.
* ignore_protection_range - if true, the test should not check against the aligned protection range, instead
* tests against actual range of contents in memory
*/
bool overlaps(std::pair<u32, u32> range, bool ignore_protection_range)
{
if (!ignore_protection_range)
return region_overlaps(locked_address_base, locked_address_base + locked_address_range, range.first, range.first + range.second);
else
return region_overlaps(cpu_address_base, cpu_address_base + cpu_address_range, range.first, range.first + range.second);
}
/** /**
* Check if the page containing the address tramples this section. Also compares a former trampled page range to compare * Check if the page containing the address tramples this section. Also compares a former trampled page range to compare
* If true, returns the range <min, max> with updated invalid range * If true, returns the range <min, max> with updated invalid range