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] Create view matrices for fisheye cube maps

Browse source 
Really any cube maps, but currently the check is for fisheye rendering.
This commit is contained in:
Bill Currie 2023-01-25 01:02:16 +09:00
parent 0ccee3032e
commit f78fcec689
2 changed files with 73 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/QF/Vulkan/qf_matrices.h
View file

@ -77,7 +77,8 @@ struct vulkan_ctx_s;
struct qfv_renderframe_s;
void Vulkan_CalcViewMatrix (struct vulkan_ctx_s *ctx);
void Vulkan_SetViewMatrix (struct vulkan_ctx_s *ctx, mat4f_t view);
void Vulkan_SetViewMatrices (struct vulkan_ctx_s *ctx, mat4f_t views[],
int count);
void Vulkan_SetSkyMatrix (struct vulkan_ctx_s *ctx, mat4f_t sky);
void Vulkan_SetSkyMatrix (struct vulkan_ctx_s *ctx, mat4f_t sky);

72
libs/video/renderer/vulkan/vulkan_matrices.c
View file

@ -50,15 +50,53 @@
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/projection.h"
#include "QF/Vulkan/staging.h"
#include "r_internal.h"
#include "vid_vulkan.h"
static void
setup_view (vulkan_ctx_t *ctx)
{
mat4f_t view;
//FIXME? The box rotations (in particular top/bottom) for vulkan are not
//compatible with the other renderers, so need a local version
static mat4f_t box_rotations[] = {
[BOX_FRONT] = {
{ 1, 0, 0, 0},
{ 0, 1, 0, 0},
{ 0, 0, 1, 0},
{ 0, 0, 0, 1}
},
[BOX_RIGHT] = {
{ 0,-1, 0, 0},
{ 1, 0, 0, 0},
{ 0, 0, 1, 0},
{ 0, 0, 0, 1}
},
[BOX_BEHIND] = {
{-1, 0, 0, 0},
{ 0,-1, 0, 0},
{ 0, 0, 1, 0},
{ 0, 0, 0, 1}
},
[BOX_LEFT] = {
{ 0, 1, 0, 0},
{-1, 0, 0, 0},
{ 0, 0, 1, 0},
{ 0, 0, 0, 1}
},
[BOX_BOTTOM] = {
{ 0, 0, 1, 0},
{ 0, 1, 0, 0},
{-1, 0, 0, 0},
{ 0, 0, 0, 1}
},
[BOX_TOP] = {
{ 0, 0,-1, 0},
{ 0, 1, 0, 0},
{ 1, 0, 0, 0},
{ 0, 0, 0, 1}
},
};
// Quake's world is z-up, x-forward, y-left, but Vulkan's world is
// z-forward, x-right, y-down.
static mat4f_t z_up = {
@ -68,8 +106,26 @@ setup_view (vulkan_ctx_t *ctx)
{ 0, 0, 0, 1},
};
static void
setup_view (vulkan_ctx_t *ctx)
{
//FIXME this should check for cube map rather than fisheye
if (scr_fisheye) {
__auto_type mctx = ctx->matrix_context;
QFV_PerspectiveTan (mctx->matrices.Projection3d, 1, 1);
mat4f_t views[6];
for (int i = 0; i < 6; i++) {
mat4f_t rotinv;
mat4ftranspose (rotinv, box_rotations[i]);
mmulf (views[i], rotinv, r_refdef.camera_inverse);
mmulf (views[i], z_up, views[i]);
}
Vulkan_SetViewMatrices (ctx, views, 6);
} else {
mat4f_t view;
mmulf (view, z_up, r_refdef.camera_inverse);
Vulkan_SetViewMatrix (ctx, view);
Vulkan_SetViewMatrices (ctx, &view, 1);
}
}
static void
@ -99,15 +155,13 @@ setup_sky (vulkan_ctx_t *ctx)
}
void
Vulkan_SetViewMatrix (vulkan_ctx_t *ctx, mat4f_t view)
Vulkan_SetViewMatrices (vulkan_ctx_t *ctx, mat4f_t views[], int count)
{
__auto_type mctx = ctx->matrix_context;
if (memcmp (mctx->matrices.View[0], view, sizeof (mat4f_t))) {
memcpy (mctx->matrices.View[0], view, sizeof (mat4f_t));
memcpy (mctx->matrices.View, views, count * sizeof (mat4f_t));
mctx->dirty = mctx->frames.size;
}
}
void
Vulkan_SetSkyMatrix (vulkan_ctx_t *ctx, mat4f_t sky)