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

rsx/common/gl/d3d12/vulkan: Use exact mimap counts.

Browse source 
Fix invalid textures in gl backend.
This commit is contained in:
Vincent Lejeune 2016-03-25 17:44:03 +01:00
parent cf402c8954
commit 9485fe2693
11 changed files with 78 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -320,7 +320,7 @@ namespace rsx
const std::vector<rsx_subresource_layout> &input_layouts = get_subresources_layout(tex);
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
glTexStorage2D(m_target, tex.mipmap(), get_sized_internal_format(format), tex.width(), tex.height());
glTexStorage2D(m_target, tex.get_exact_mipmap_count(), get_sized_internal_format(format), tex.width(), tex.height());
if (!is_compressed_format(format))
{
@ -345,7 +345,7 @@ namespace rsx
const std::array<GLenum, 4>& glRemap = get_swizzle_remap(format);
glTexParameteri(m_target, GL_TEXTURE_MAX_LEVEL, tex.mipmap() - 1);
glTexParameteri(m_target, GL_TEXTURE_MAX_LEVEL, tex.get_exact_mipmap_count() - 1);
if (format != CELL_GCM_TEXTURE_B8 && format != CELL_GCM_TEXTURE_X16 && format != CELL_GCM_TEXTURE_X32_FLOAT)
{
@ -382,7 +382,7 @@ namespace rsx
if (min_filter != GL_LINEAR && min_filter != GL_NEAREST)
{
if (tex.mipmap() <= 1 || m_target == GL_TEXTURE_RECTANGLE)
if (tex.get_exact_mipmap_count() <= 1 || m_target == GL_TEXTURE_RECTANGLE)
{
LOG_WARNING(RSX, "Texture %d, target 0x%X, requesting mipmap filtering without any mipmaps set!", m_id, m_target);
min_filter = GL_LINEAR;