mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-14 06:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl: Fix buffer size calculations

Browse Source
This commit is contained in:
kd-11 2019-03-08 11:27:33 +03:00 committed by kd-11
parent 358558aaa7
commit 1875dc3f18
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpcs3/Emu/RSX/GL/GLTextureCache.h
View File

@ -129,11 +129,10 @@ namespace gl
return size; return size;
} }
void init_buffer() void init_buffer(const gl::texture* src)
{ {
const f32 resolution_scale = (context == rsx::texture_upload_context::framebuffer_storage? rsx::get_resolution_scale() : 1.f); const u32 vram_size = src->pitch() * src->height();
const u32 real_buffer_size = (resolution_scale <= 1.f) ? get_section_size() : (u32)(resolution_scale * resolution_scale * get_section_size()); const u32 buffer_size = align(vram_size, 4096);
const u32 buffer_size = align(real_buffer_size, 4096);
if (pbo_id) if (pbo_id)
{ {
@ -171,9 +170,6 @@ namespace gl
} }
else else
{ {
if (pbo_id == 0)
init_buffer();
aa_mode = static_cast<gl::render_target*>(image)->read_aa_mode; aa_mode = static_cast<gl::render_target*>(image)->read_aa_mode;
ASSERT(managed_texture.get() == nullptr); ASSERT(managed_texture.get() == nullptr);
} }
@ -219,12 +215,6 @@ namespace gl
baseclass::on_section_resources_created(); baseclass::on_section_resources_created();
} }
void make_flushable()
{
//verify(HERE), pbo_id == 0;
init_buffer();
}
void set_dimensions(u32 width, u32 height, u32 /*depth*/, u32 pitch) void set_dimensions(u32 width, u32 height, u32 /*depth*/, u32 pitch)
{ {
this->width = width; this->width = width;
@ -267,11 +257,6 @@ namespace gl
if (as_rtt->dirty) as_rtt->read_barrier(cmd); if (as_rtt->dirty) as_rtt->read_barrier(cmd);
} }
if (!pbo_id)
{
init_buffer();
}
gl::texture* target_texture = vram_texture; gl::texture* target_texture = vram_texture;
if ((rsx::get_resolution_scale_percent() != 100 && context == rsx::texture_upload_context::framebuffer_storage) || if ((rsx::get_resolution_scale_percent() != 100 && context == rsx::texture_upload_context::framebuffer_storage) ||
(vram_texture->pitch() != rsx_pitch)) (vram_texture->pitch() != rsx_pitch))
@ -325,6 +310,8 @@ namespace gl
} }
} }
init_buffer(target_texture);
glGetError(); glGetError();
glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo_id); glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo_id);
@ -946,7 +933,6 @@ namespace gl
} }
//NOTE: Protection is handled by the caller //NOTE: Protection is handled by the caller
cached.make_flushable();
cached.set_dimensions(width, height, depth, (rsx_range.length() / height)); cached.set_dimensions(width, height, depth, (rsx_range.length() / height));
no_access_range = cached.get_min_max(no_access_range, rsx::section_bounds::locked_range); no_access_range = cached.get_min_max(no_access_range, rsx::section_bounds::locked_range);
} }