ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(shader_vulkan) Simplifications - start making shader_gl_Core 

and shader_vulkan more alike
This commit is contained in:
twinaphex 2019-04-24 23:13:42 +02:00
parent e42dae928e
commit 604403fe90
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gfx/drivers_shader/shader_vulkan.cpp
View File

@ -692,27 +692,33 @@ void vulkan_filter_chain::flush()
void vulkan_filter_chain::update_history_info() void vulkan_filter_chain::update_history_info()
{ {
unsigned i = 0; unsigned i = 0;
for (auto &texture : original_history)
for (i = 0; i < original_history.size(); i++)
{ {
Texture &source = common.original_history[i]; Texture *source = (Texture*)&common.original_history[i];
source.texture.image = texture->get_image();
source.texture.view = texture->get_view(); if (!source)
source.texture.layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; continue;
source.texture.width = texture->get_size().width;
source.texture.height = texture->get_size().height; source->texture.layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
source.filter = passes.front()->get_source_filter();
source.mip_filter = passes.front()->get_mip_filter(); source->texture.view = original_history[i]->get_view();
source.address = passes.front()->get_address_mode(); source->texture.image = original_history[i]->get_image();
i++; source->texture.width = original_history[i]->get_size().width;
source->texture.height = original_history[i]->get_size().height;
source->filter = passes.front()->get_source_filter();
source->mip_filter = passes.front()->get_mip_filter();
source->address = passes.front()->get_address_mode();
} }
} }
void vulkan_filter_chain::update_feedback_info() void vulkan_filter_chain::update_feedback_info()
{ {
unsigned i;
if (common.framebuffer_feedback.empty()) if (common.framebuffer_feedback.empty())
return; return;
for (unsigned i = 0; i < passes.size() - 1; i++) for (i = 0; i < passes.size() - 1; i++)
{ {
auto fb = passes[i]->get_feedback_framebuffer(); auto fb = passes[i]->get_feedback_framebuffer();
if (!fb) if (!fb)