qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 20:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Upload palette as a 16x16 image

Browse source 
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.
This commit is contained in:
Bill Currie 2022-11-15 09:26:17 +09:00
parent 251e47f4d6
commit 2e21ca4b9a
7 changed files with 171 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/Makemodule.am
View file

@ -199,6 +199,7 @@ include_qf_vulkan = \
include/QF/Vulkan/qf_main.h \
include/QF/Vulkan/qf_matrices.h \
include/QF/Vulkan/qf_model.h \
include/QF/Vulkan/qf_palette.h \
include/QF/Vulkan/qf_particles.h \
include/QF/Vulkan/qf_renderpass.h \
include/QF/Vulkan/qf_scene.h \

49
include/QF/Vulkan/qf_palette.h Normal file
View file

@ -0,0 +1,49 @@
/*
qf_palette.h
Vulkan matrix "pass"
Copyright (C) 2021 Bill Currie <bill@taniwha.org>
Author: Bill Currie <bill@taniwha.org>
Date: 2021/12/8
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
*/
#ifndef __QF_Vulkan_qf_palette_h
#define __QF_Vulkan_qf_palette_h
#include "QF/darray.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/command.h"
#include "QF/Vulkan/image.h"
typedef struct palettectx_s {
struct qfv_tex_s *palette;
VkSampler sampler;
} palettectx_t;
struct vulkan_ctx_s;
void Vulkan_Palette_Update (struct vulkan_ctx_s *ctx, const byte *palette);
void Vulkan_Palette_Init (struct vulkan_ctx_s *ctx, const byte *palette);
void Vulkan_Palette_Shutdown (struct vulkan_ctx_s *ctx);
#endif//__QF_Vulkan_qf_palette_h

1
include/vid_vulkan.h
View file

@ -70,6 +70,7 @@ typedef struct vulkan_ctx_s {
struct bspctx_s *bsp_context;
struct iqmctx_s *iqm_context;
struct scenectx_s *scene_context;
struct palettectx_s *palette_context;
struct particlectx_s *particle_context;
struct spritectx_s *sprite_context;
struct drawctx_s *draw_context;

1
libs/video/renderer/Makemodule.am
View file

@ -243,6 +243,7 @@ libs_video_renderer_librender_vulkan_la_SOURCES = \
libs/video/renderer/vulkan/vulkan_lighting.c \
libs/video/renderer/vulkan/vulkan_main.c \
libs/video/renderer/vulkan/vulkan_matrices.c \
libs/video/renderer/vulkan/vulkan_palette.c \
libs/video/renderer/vulkan/vulkan_particles.c \
libs/video/renderer/vulkan/vulkan_renderpass.c \
libs/video/renderer/vulkan/vulkan_scene.c \

9
libs/video/renderer/vid_render_vulkan.c
View file

@ -50,6 +50,7 @@
#include "QF/Vulkan/qf_lightmap.h"
#include "QF/Vulkan/qf_main.h"
#include "QF/Vulkan/qf_matrices.h"
#include "QF/Vulkan/qf_palette.h"
#include "QF/Vulkan/qf_particles.h"
#include "QF/Vulkan/qf_renderpass.h"
#include "QF/Vulkan/qf_scene.h"
@ -89,6 +90,7 @@ vulkan_R_Init (void)
Vulkan_CreateStagingBuffers (vulkan_ctx);
Vulkan_CreateFrames (vulkan_ctx);
Vulkan_Texture_Init (vulkan_ctx);
Vulkan_Palette_Init (vulkan_ctx, vid.palette);
Vulkan_CreateSwapchain (vulkan_ctx);
Vulkan_CreateCapture (vulkan_ctx);
@ -669,9 +671,9 @@ vulkan_Skin_InitTranslations (void)
static void
set_palette (void *data, const byte *palette)
{
//FIXME really don't want this here: need an application domain
//so Quake can be separated from QuakeForge (ie, Quake itself becomes
//an app using the QuakeForge engine)
if (vulkan_ctx->palette_context) {
Vulkan_Palette_Update (vulkan_ctx, palette);
}
}
static void
@ -774,6 +776,7 @@ vulkan_vid_render_shutdown (void)
Vulkan_Scene_Shutdown (vulkan_ctx);
Vulkan_Matrix_Shutdown (vulkan_ctx);
Vulkan_Palette_Shutdown (vulkan_ctx);
Vulkan_Texture_Shutdown (vulkan_ctx);
Vulkan_DestroyRenderPasses (vulkan_ctx);

17
libs/video/renderer/vulkan/qfpipeline.plist
View file

@ -23,6 +23,23 @@
borderColor = float_transparent_black;
unnormalizedCoordinates = false;
};
palette_sampler = {
magFilter = nearest;
minFilter = nearest;
mipmapMode = nearest;
addressModeU = clamp_to_edge;
addressModeV = clamp_to_edge;
addressModeW = clamp_to_edge;
mipLodBias = 0;
anisotropyEnable = false;
maxAnisotropy = 0;
compareEnable = false;
compareOp = always;
minLod = 0;
maxLod = 4;
borderColor = float_transparent_black;
unnormalizedCoordinates = false;
};
quakebsp_sampler = {
magFilter = linear;
minFilter = linear;

96
libs/video/renderer/vulkan/vulkan_palette.c Normal file
View file

@ -0,0 +1,96 @@
/*
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"
#include "QF/Vulkan/qf_palette.h"
#include "QF/Vulkan/qf_texture.h"
#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_UpdateTex (ctx, pctx->palette, &tex, 0, 0, 0, 0);
}
void
Vulkan_Palette_Init (vulkan_ctx_t *ctx, const byte *palette)
{
qfvPushDebug (ctx, "palette init");
palettectx_t *pctx = calloc (1, sizeof (palettectx_t));
ctx->palette_context = pctx;
pctx->sampler = Vulkan_CreateSampler (ctx, "palette_sampler");
tex_t tex = {
.width = 16,
.height = 16,
.format = tex_rgb,
.loaded = 1,
.data = (byte *) palette,
};
pctx->palette = Vulkan_LoadTex (ctx, &tex, 0, "palette");
qfvPopDebug (ctx);
}
void
Vulkan_Palette_Shutdown (vulkan_ctx_t *ctx)
{
qfvPushDebug (ctx, "palette shutdown");
__auto_type pctx = ctx->palette_context;
Vulkan_UnloadTex (ctx, pctx->palette);
free (pctx);
qfvPopDebug (ctx);
}