qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 21:21:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/vulkan/vulkan_palette.c

145 lines
3.1 KiB
C
Raw Normal View History

[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
/*
vulkan_palette.c
Vulkan palette image
Copyright (C) 2022 Bill Currie <bill@taniwha.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#ifdef HAVE_MATH_H
# include <math.h>
#endif
#include "QF/sys.h"
#include "QF/va.h"
#include "QF/Vulkan/instance.h"
[vulkan] Clean up the sampler config loading Samplers have no direct relation to render passes or pipelines, so should not necessarily be in the same config file. This makes all the old config files obsolete, and quite a bit of support code in vkparse.c.
2023-06-25 14:33:47 +00:00
#include "QF/Vulkan/render.h"
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
#include "QF/Vulkan/qf_palette.h"
#include "QF/Vulkan/qf_texture.h"
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
#include "r_internal.h"
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
#include "vid_vulkan.h"
void
Vulkan_Palette_Update (vulkan_ctx_t *ctx, const byte *palette)
{
palettectx_t *pctx = ctx->palette_context;
tex_t tex = {
.width = 16,
.height = 16,
.format = tex_rgb,
.loaded = 1,
.data = (byte *) palette,
};
[vulkan] Optionally include vertex shader in tex update The particle renderer uses the palette texture in the vertex shader, so updating the palette needs the vertex shader stage included in the barrier, but I imagine not all texture updates will need it, so add a parameter to Vulkan_UpdateTex to select inclusion.
2024-04-18 01:16:44 +00:00
Vulkan_UpdateTex (ctx, pctx->palette, &tex, 0, 0, 0, 0, true);
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
}
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
static void
palette_shutdown (exprctx_t *ectx)
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
{
Clean up about 12000 allocations Some of them were actual leaks, but tracking memory should be a lot easier now. However, there's a lot of room for optimization of allocations (eg, recylcling of hierarchies. There is now 1 active allocation (according to tracy) when nq exits: Qgetline's string buffer (I think an api change is in order).
2024-01-04 05:10:57 +00:00
qfZoneScoped (true);
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
auto taskctx = (qfv_taskctx_t *) ectx;
auto ctx = taskctx->ctx;
qfvPushDebug (ctx, "palette shutdown");
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
auto pctx = ctx->palette_context;
Vulkan_UnloadTex (ctx, pctx->palette);
free (pctx);
qfvPopDebug (ctx);
}
static void
palette_startup (exprctx_t *ectx)
{
qfZoneScoped (true);
auto taskctx = (qfv_taskctx_t *) ectx;
auto ctx = taskctx->ctx;
qfvPushDebug (ctx, "palette init");
auto pctx = ctx->palette_context;
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
[vulkan] Clean up the sampler config loading Samplers have no direct relation to render passes or pipelines, so should not necessarily be in the same config file. This makes all the old config files obsolete, and quite a bit of support code in vkparse.c.
2023-06-25 14:33:47 +00:00
pctx->sampler = QFV_Render_Sampler (ctx, "palette_sampler");
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
tex_t tex = {
.width = 16,
.height = 16,
.format = tex_rgb,
.loaded = 1,
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
.data = (byte *) vid.palette,
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
};
pctx->palette = Vulkan_LoadTex (ctx, &tex, 0, "palette");
[vulkan] Use palette lookups for top/bottom colors As the RGB curves for many of the color rows are not linearly related, my idea of scaling the brightest color in the row just didn't work. Using a masked palette lookup works much better as it allows any curves. Also, because the palette is uploaded as a grid and the coordinates are calculated on the CPU, the system is extendable beyond 8-bit palettes. This isn't quite complete as the top and bottom colors are still in separate layers but their indices and masks can fit in just one, but this requires reworking the texture setup (for another commit).
2022-11-15 02:47:28 +00:00
pctx->descriptor = Vulkan_CreateCombinedImageSampler (ctx,
pctx->palette->view,
pctx->sampler);
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
qfvPopDebug (ctx);
}
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
static void
palette_init (const exprval_t **params, exprval_t *result, exprctx_t *ectx)
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
{
[vulkan] Add tracy zones to most shutdown functions This helped find the 5s hang on exit.
2024-01-16 04:46:37 +00:00
qfZoneScoped (true);
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
auto taskctx = (qfv_taskctx_t *) ectx;
auto ctx = taskctx->ctx;
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
QFV_Render_AddShutdown (ctx, palette_shutdown);
QFV_Render_AddStartup (ctx, palette_startup);
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
palettectx_t *pctx = calloc (1, sizeof (palettectx_t));
ctx->palette_context = pctx;
}
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
[vulkan] Script render graph initialization sequence While every possible subsystem needs an initialization call, all that does is add the actual initialization task to the render graph system. This allows the render graph to be fully configurable, initializing only those subsystems that the graph needs. Scripted initialization is still separated from startup as render graph creation needs various resources (eg, attachments) defined before creating render and compute passes, but all those need to be created before the subsystems can actually start up.
2024-01-28 11:29:19 +00:00
static exprfunc_t palette_init_func[] = {
{ .func = palette_init },
{}
};
static exprsym_t palette_task_syms[] = {
{ "palette_init", &cexpr_function, palette_init_func },
{}
};
void
Vulkan_Palette_Init (vulkan_ctx_t *ctx)
{
qfZoneScoped (true);
QFV_Render_AddTasks (ctx, palette_task_syms);
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
}
[vulkan] Use palette lookups for top/bottom colors As the RGB curves for many of the color rows are not linearly related, my idea of scaling the brightest color in the row just didn't work. Using a masked palette lookup works much better as it allows any curves. Also, because the palette is uploaded as a grid and the coordinates are calculated on the CPU, the system is extendable beyond 8-bit palettes. This isn't quite complete as the top and bottom colors are still in separate layers but their indices and masks can fit in just one, but this requires reworking the texture setup (for another commit).
2022-11-15 02:47:28 +00:00
VkDescriptorSet
Vulkan_Palette_Descriptor (struct vulkan_ctx_s *ctx)
{
__auto_type pctx = ctx->palette_context;
return pctx->descriptor;
}
Reference in a new issue Copy permalink