RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 04:32:35 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1564 from kd-11/vulkan-wip

Browse Source 
vk/gl: Add some more blend ops for vulkan; fix immutable storage for opengl
This commit is contained in:
Raul Tambre 2016-03-14 19:38:37 +02:00
commit e33c684b49
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/RSX/GL/gl_texture_cache.h
View File

@ -483,6 +483,8 @@ namespace gl
}
else
{
u32 real_id = gl_texture.id();
if (!obj) gl_texture.set_id(0);
else
{
@ -499,6 +501,8 @@ namespace gl
_obj.block_sz = (u32)get_texture_size(tex);
lock_gl_object(_obj);
gl_texture.set_id(real_id);
}
}

8
rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp
View File

@ -265,11 +265,9 @@ namespace rsx
{
const u32 texaddr = rsx::get_address(tex.offset(), tex.location());
//TODO: safe init
if (!m_id)
{
create();
}
//We can't re-use texture handles if using immutable storage
if (m_id) remove();
create();
glActiveTexture(GL_TEXTURE0 + index);
bind();

2
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View File

@ -141,6 +141,8 @@ namespace vk
case CELL_GCM_FUNC_ADD: return VK_BLEND_OP_ADD;
case CELL_GCM_FUNC_SUBTRACT: return VK_BLEND_OP_SUBTRACT;
case CELL_GCM_FUNC_REVERSE_SUBTRACT: return VK_BLEND_OP_REVERSE_SUBTRACT;
case CELL_GCM_MIN: return VK_BLEND_OP_MIN;
case CELL_GCM_MAX: return VK_BLEND_OP_MAX;
default:
throw EXCEPTION("Unknown blend op: 0x%X", op);
}