From 94b589567b7ec36c94a1ba40ab0307481424ec62 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 21 Jan 2021 16:39:11 +0900 Subject: [PATCH] [vulkan] Rename texture.c to scrap.c I had originally planned on mixing the stage management with general texture support code like I did in glsl, but I think that was a mistake and I did keep looking for scrap.[ch] when I wanted to edit something to do with the scrap... --- include/QF/Vulkan/{texture.h => scrap.h} | 6 +++--- libs/video/renderer/Makemodule.am | 2 +- libs/video/renderer/vulkan/{texture.c => scrap.c} | 6 +++--- libs/video/renderer/vulkan/vulkan_bsp.c | 2 +- libs/video/renderer/vulkan/vulkan_draw.c | 2 +- libs/video/renderer/vulkan/vulkan_lightmap.c | 2 +- libs/video/renderer/vulkan/vulkan_texture.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename include/QF/Vulkan/{texture.h => scrap.h} (87%) rename libs/video/renderer/vulkan/{texture.c => scrap.c} (99%) diff --git a/include/QF/Vulkan/texture.h b/include/QF/Vulkan/scrap.h similarity index 87% rename from include/QF/Vulkan/texture.h rename to include/QF/Vulkan/scrap.h index 35aaf5bb5..563a46cc2 100644 --- a/include/QF/Vulkan/texture.h +++ b/include/QF/Vulkan/scrap.h @@ -1,5 +1,5 @@ -#ifndef __QF_Vulkan_texture_h -#define __QF_Vulkan_texture_h +#ifndef __QF_Vulkan_scrap_h +#define __QF_Vulkan_scrap_h #include "QF/image.h" @@ -21,4 +21,4 @@ void *QFV_SubpicBatch (subpic_t *subpic, struct qfv_stagebuf_s *stage); void QFV_ScrapFlush (scrap_t *scrap); -#endif//__QF_Vulkan_texture_h +#endif//__QF_Vulkan_scrap_h diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am index a200747ff..5a30c9f0c 100644 --- a/libs/video/renderer/Makemodule.am +++ b/libs/video/renderer/Makemodule.am @@ -229,10 +229,10 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \ libs/video/renderer/vulkan/namehack.h \ libs/video/renderer/vulkan/pipeline.c \ libs/video/renderer/vulkan/renderpass.c \ + libs/video/renderer/vulkan/scrap.c \ libs/video/renderer/vulkan/shader.c \ libs/video/renderer/vulkan/staging.c \ libs/video/renderer/vulkan/swapchain.c \ - libs/video/renderer/vulkan/texture.c \ libs/video/renderer/vulkan/util.c \ libs/video/renderer/vulkan/util.h \ libs/video/renderer/vulkan/vkparse.c \ diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/scrap.c similarity index 99% rename from libs/video/renderer/vulkan/texture.c rename to libs/video/renderer/vulkan/scrap.c index 112c71a92..6e17e786c 100644 --- a/libs/video/renderer/vulkan/texture.c +++ b/libs/video/renderer/vulkan/scrap.c @@ -1,7 +1,7 @@ /* - texuture.c + scrap.c - Vulkan texuture manager + Vulkan scrap manager Copyright (C) 2021 Bill Currie @@ -54,8 +54,8 @@ #include "QF/Vulkan/device.h" #include "QF/Vulkan/image.h" #include "QF/Vulkan/instance.h" +#include "QF/Vulkan/scrap.h" #include "QF/Vulkan/staging.h" -#include "QF/Vulkan/texture.h" #include "r_scrap.h" #include "vid_vulkan.h" diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c index cf6e6dda2..d8c45d556 100644 --- a/libs/video/renderer/vulkan/vulkan_bsp.c +++ b/libs/video/renderer/vulkan/vulkan_bsp.c @@ -59,8 +59,8 @@ #include "QF/Vulkan/command.h" #include "QF/Vulkan/descriptor.h" #include "QF/Vulkan/device.h" +#include "QF/Vulkan/scrap.h" #include "QF/Vulkan/staging.h" -#include "QF/Vulkan/texture.h" #include "r_internal.h" #include "vid_vulkan.h" diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c index cca17f727..7345fccd5 100644 --- a/libs/video/renderer/vulkan/vulkan_draw.c +++ b/libs/video/renderer/vulkan/vulkan_draw.c @@ -59,8 +59,8 @@ #include "QF/Vulkan/descriptor.h" #include "QF/Vulkan/device.h" #include "QF/Vulkan/image.h" +#include "QF/Vulkan/scrap.h" #include "QF/Vulkan/staging.h" -#include "QF/Vulkan/texture.h" #include "r_internal.h" #include "vid_vulkan.h" diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c index 495864d9f..01025e110 100644 --- a/libs/video/renderer/vulkan/vulkan_lightmap.c +++ b/libs/video/renderer/vulkan/vulkan_lightmap.c @@ -49,7 +49,7 @@ #include "QF/Vulkan/qf_bsp.h" #include "QF/Vulkan/qf_lightmap.h" #include "QF/Vulkan/qf_main.h" -#include "QF/Vulkan/texture.h" +#include "QF/Vulkan/scrap.h" #include "compat.h" #include "r_internal.h" diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c index bc95431b0..a35498fef 100644 --- a/libs/video/renderer/vulkan/vulkan_texture.c +++ b/libs/video/renderer/vulkan/vulkan_texture.c @@ -56,8 +56,8 @@ #include "QF/Vulkan/device.h" #include "QF/Vulkan/image.h" #include "QF/Vulkan/instance.h" +#include "QF/Vulkan/scrap.h" #include "QF/Vulkan/staging.h" -#include "QF/Vulkan/texture.h" #include "r_scrap.h" #include "vid_vulkan.h"