From 90c7878a53651fad3206dd42ffac4790afee5ae5 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 25 Mar 2019 18:22:56 +0100 Subject: [PATCH] [dxvk] Rename dxvk_resolve_{vert|geom} -> dxvk_copy_{vert|geom} --- src/dxvk/dxvk_meta_copy.cpp | 9 ++++----- src/dxvk/meson.build | 5 ++--- .../{dxvk_resolve_geom.geom => dxvk_copy_geom.geom} | 0 .../{dxvk_resolve_vert.vert => dxvk_copy_vert.vert} | 0 4 files changed, 6 insertions(+), 8 deletions(-) rename src/dxvk/shaders/{dxvk_resolve_geom.geom => dxvk_copy_geom.geom} (100%) rename src/dxvk/shaders/{dxvk_resolve_vert.vert => dxvk_copy_vert.vert} (100%) diff --git a/src/dxvk/dxvk_meta_copy.cpp b/src/dxvk/dxvk_meta_copy.cpp index a3ab7b37..de7dcfe8 100644 --- a/src/dxvk/dxvk_meta_copy.cpp +++ b/src/dxvk/dxvk_meta_copy.cpp @@ -1,5 +1,7 @@ #include "dxvk_meta_copy.h" +#include +#include #include #include #include @@ -7,9 +9,6 @@ #include #include -#include -#include - namespace dxvk { DxvkMetaCopyRenderPass::DxvkMetaCopyRenderPass( @@ -120,8 +119,8 @@ namespace dxvk { DxvkMetaCopyObjects::DxvkMetaCopyObjects(const Rc& vkd) : m_vkd (vkd), m_sampler (createSampler()), - m_shaderVert (createShaderModule(dxvk_resolve_vert)), - m_shaderGeom (createShaderModule(dxvk_resolve_geom)), + m_shaderVert (createShaderModule(dxvk_copy_vert)), + m_shaderGeom (createShaderModule(dxvk_copy_geom)), m_color { createShaderModule(dxvk_copy_color_1d), createShaderModule(dxvk_copy_color_2d), diff --git a/src/dxvk/meson.build b/src/dxvk/meson.build index 8ada5c00..d00e5d18 100644 --- a/src/dxvk/meson.build +++ b/src/dxvk/meson.build @@ -12,6 +12,8 @@ dxvk_shaders = files([ 'shaders/dxvk_clear_image3d_u.comp', 'shaders/dxvk_clear_image3d_f.comp', + 'shaders/dxvk_copy_vert.vert', + 'shaders/dxvk_copy_geom.geom', 'shaders/dxvk_copy_color_1d.frag', 'shaders/dxvk_copy_color_2d.frag', 'shaders/dxvk_copy_color_ms.frag', @@ -27,9 +29,6 @@ dxvk_shaders = files([ 'shaders/dxvk_pack_d24s8.comp', 'shaders/dxvk_pack_d32s8.comp', - - 'shaders/dxvk_resolve_geom.geom', - 'shaders/dxvk_resolve_vert.vert', 'hud/shaders/hud_line.frag', 'hud/shaders/hud_text.frag', diff --git a/src/dxvk/shaders/dxvk_resolve_geom.geom b/src/dxvk/shaders/dxvk_copy_geom.geom similarity index 100% rename from src/dxvk/shaders/dxvk_resolve_geom.geom rename to src/dxvk/shaders/dxvk_copy_geom.geom diff --git a/src/dxvk/shaders/dxvk_resolve_vert.vert b/src/dxvk/shaders/dxvk_copy_vert.vert similarity index 100% rename from src/dxvk/shaders/dxvk_resolve_vert.vert rename to src/dxvk/shaders/dxvk_copy_vert.vert