From 999f878b76da67b01f3680f65c54e24d39290602 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 1 Feb 2024 21:58:12 +0900 Subject: [PATCH] [vulkan] Rename alias_sampler to qskin_sampler It's shared by both alias and iqm models. --- libs/video/renderer/vulkan/smp_quake.plist | 2 +- libs/video/renderer/vulkan/vulkan_alias.c | 2 +- libs/video/renderer/vulkan/vulkan_iqm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/video/renderer/vulkan/smp_quake.plist b/libs/video/renderer/vulkan/smp_quake.plist index 6d34ff8c8..b4ab10b4d 100644 --- a/libs/video/renderer/vulkan/smp_quake.plist +++ b/libs/video/renderer/vulkan/smp_quake.plist @@ -67,7 +67,7 @@ samplers = { borderColor = float_transparent_black; unnormalizedCoordinates = false; }; - alias_sampler = { + qskin_sampler = { magFilter = linear; minFilter = linear; mipmapMode = linear; diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c index fa70cde10..08ff0343e 100644 --- a/libs/video/renderer/vulkan/vulkan_alias.c +++ b/libs/video/renderer/vulkan/vulkan_alias.c @@ -376,7 +376,7 @@ alias_startup (exprctx_t *ectx) auto taskctx = (qfv_taskctx_t *) ectx; auto ctx = taskctx->ctx; auto actx = ctx->alias_context; - actx->sampler = QFV_Render_Sampler (ctx, "alias_sampler"); + actx->sampler = QFV_Render_Sampler (ctx, "qskin_sampler"); } static void diff --git a/libs/video/renderer/vulkan/vulkan_iqm.c b/libs/video/renderer/vulkan/vulkan_iqm.c index e7a4e9b46..a1a99da69 100644 --- a/libs/video/renderer/vulkan/vulkan_iqm.c +++ b/libs/video/renderer/vulkan/vulkan_iqm.c @@ -441,7 +441,7 @@ iqm_startup (exprctx_t *ectx) DARRAY_INIT (&ictx->frames, frames); DARRAY_RESIZE (&ictx->frames, frames); ictx->frames.grow = 0; - ictx->sampler = QFV_Render_Sampler (ctx, "alias_sampler"); + ictx->sampler = QFV_Render_Sampler (ctx, "qskin_sampler"); } static void