qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-27 22:52:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/vulkan/vulkan_bsp.c

1593 lines
45 KiB
C
Raw Normal View History

[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
/*
vulkan_bsp.c
Vulkan bsp
Copyright (C) 2012 Bill Currie <bill@taniwha.org>
Copyright (C) 2021 Bill Currie <bill@taniwha.org>
Author: Bill Currie <bill@taniwha.org>
Date: 2012/1/7
Date: 2021/1/18
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
#include <stdlib.h>
#include "qfalloca.h"
#include "QF/cvar.h"
#include "QF/darray.h"
#include "QF/image.h"
#include "QF/render.h"
#include "QF/sys.h"
#include "QF/va.h"
[scene] Rename libQFentity to libQFscene And start working on scene management.
2021-07-24 05:19:52 +00:00
#include "QF/scene/entity.h"
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#include "QF/Vulkan/qf_bsp.h"
#include "QF/Vulkan/qf_lightmap.h"
#include "QF/Vulkan/qf_texture.h"
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
#include "QF/Vulkan/buffer.h"
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
#include "QF/Vulkan/barrier.h"
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#include "QF/Vulkan/command.h"
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
#include "QF/Vulkan/debug.h"
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
#include "QF/Vulkan/image.h"
[vulkan] Get wall rendering partially working Many surfaces are missing (I suspect it's due to transform stage management in the index emitter), and currently only the light maps are rendered (still not binding the correct textures), but the basics are working.
2021-01-21 17:20:32 +00:00
#include "QF/Vulkan/instance.h"
[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...
2021-01-21 07:39:11 +00:00
#include "QF/Vulkan/scrap.h"
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#include "QF/Vulkan/staging.h"
#include "r_internal.h"
#include "vid_vulkan.h"
[vulkan] Fix some 32-bit compatibility issues mostly dealing with vulkan's handles always being 64-bit, but pointers being either 32 or 64.
2021-04-01 23:48:11 +00:00
static const char * __attribute__((used)) bsp_pass_names[] = {
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
"depth",
"g-buffer",
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
"sky",
"turb",
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
};
[vulkan] Use correct vertex shader for skys This gets skys rendering again, but their depth is incorrect.
2021-03-22 23:25:56 +00:00
static QFV_Subpass subpass_map[] = {
QFV_passDepth, // QFV_bspDepth
QFV_passGBuffer, // QFV_bspGBuffer
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
QFV_passTranslucent, // QFV_bspSky
QFV_passTranslucent, // QFV_bspTurb
[vulkan] Use correct vertex shader for skys This gets skys rendering again, but their depth is incorrect.
2021-03-22 23:25:56 +00:00
};
[vulkan] Reset model transform for world surfaces Fixes the misplaced walls.
2021-01-21 17:42:58 +00:00
static float identity[] = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
};
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#define ALLOC_CHUNK 64
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
typedef struct bsppoly_s {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
uint32_t count;
uint32_t indices[1];
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
} bsppoly_t;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#define CHAIN_SURF_F2B(surf,chain) \
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
({ \
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
instsurf_t *inst = (surf)->instsurf; \
if (__builtin_expect(!inst, 1)) \
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
inst = get_instsurf (bctx); \
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
inst->surface = (surf); \
*(chain##_tail) = inst; \
(chain##_tail) = &inst->tex_chain; \
*(chain##_tail) = 0; \
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
inst; \
})
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#define CHAIN_SURF_B2F(surf,chain) \
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
({ \
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
instsurf_t *inst = (surf)->instsurf; \
if (__builtin_expect(!inst, 1)) \
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
inst = get_instsurf (bctx); \
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
inst->surface = (surf); \
inst->tex_chain = (chain); \
(chain) = inst; \
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
inst; \
})
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
#define GET_RELEASE(type,name) \
static inline type * \
get_##name (bspctx_t *bctx) \
{ \
type *ele; \
if (!bctx->free_##name##s) { \
int i; \
bctx->free_##name##s = calloc (ALLOC_CHUNK, sizeof (type)); \
for (i = 0; i < ALLOC_CHUNK - 1; i++) \
bctx->free_##name##s[i]._next = &bctx->free_##name##s[i + 1]; \
} \
ele = bctx->free_##name##s; \
bctx->free_##name##s = ele->_next; \
ele->_next = 0; \
*bctx->name##s_tail = ele; \
bctx->name##s_tail = &ele->_next; \
return ele; \
} \
static inline void \
release_##name##s (bspctx_t *bctx) \
{ \
if (bctx->name##s) { \
*bctx->name##s_tail = bctx->free_##name##s; \
bctx->free_##name##s = bctx->name##s; \
bctx->name##s = 0; \
bctx->name##s_tail = &bctx->name##s; \
} \
}
GET_RELEASE (elechain_t, elechain)
GET_RELEASE (elements_t, elements)
GET_RELEASE (instsurf_t, static_instsurf)
GET_RELEASE (instsurf_t, instsurf)
static void
add_texture (texture_t *tx, vulkan_ctx_t *ctx)
{
bspctx_t *bctx = ctx->bsp_context;
vulktex_t *tex = tx->render;
DARRAY_APPEND (&bctx->texture_chains, tex);
tex->tex_chain = 0;
tex->tex_chain_tail = &tex->tex_chain;
tex->elechain = 0;
tex->elechain_tail = &tex->elechain;
}
static void
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
init_surface_chains (mod_brush_t *brush, vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
bspctx_t *bctx = ctx->bsp_context;
release_static_instsurfs (bctx);
release_instsurfs (bctx);
[util] Make bsp_t counts size_t and other bsp data counts unsigned, and clean up the resulting mess.
2021-08-01 12:54:05 +00:00
for (unsigned i = 0; i < brush->nummodelsurfaces; i++) {
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
brush->surfaces[i].instsurf = get_static_instsurf (bctx);
brush->surfaces[i].instsurf->surface = &brush->surfaces[i];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
}
static inline void
clear_tex_chain (vulktex_t *tex)
{
tex->tex_chain = 0;
tex->tex_chain_tail = &tex->tex_chain;
tex->elechain = 0;
tex->elechain_tail = &tex->elechain;
}
static void
clear_texture_chains (bspctx_t *bctx)
{
for (size_t i = 0; i < bctx->texture_chains.size; i++) {
if (!bctx->texture_chains.a[i])
continue;
clear_tex_chain (bctx->texture_chains.a[i]);
}
clear_tex_chain (r_notexture_mip->render);
release_elechains (bctx);
release_elementss (bctx);
release_instsurfs (bctx);
}
void
Vulkan_ClearElements (vulkan_ctx_t *ctx)
{
bspctx_t *bctx = ctx->bsp_context;
release_elechains (bctx);
release_elementss (bctx);
}
static inline void
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
chain_surface (msurface_t *surf, vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
bspctx_t *bctx = ctx->bsp_context;
instsurf_t *is;
if (surf->flags & SURF_DRAWSKY) {
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
is = CHAIN_SURF_F2B (surf, bctx->sky_chain);
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
} else if ((surf->flags & SURF_DRAWTURB)
|| (bctx->color && bctx->color[3] < 1.0)) {
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
is = CHAIN_SURF_B2F (surf, bctx->waterchain);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
} else {
texture_t *tx;
vulktex_t *tex;
if (!surf->texinfo->texture->anim_total)
tx = surf->texinfo->texture;
else
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
tx = R_TextureAnimation (bctx->entity, surf);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
tex = tx->render;
[renderer] Remove tinst from msurface_t Its sole purpose was to pass the newly allocated instsurf when chaining an instance model (ammo box, etc) surface, but using expresion statements removes the need for such shenanigans, and even makes msurface_t that little bit smaller (though a separate array would be much better for cache coherence). More importantly, the relevant code is actually easier to understand: I spent way too long working out what tinst was for and why it was never cleared.
2021-07-13 07:02:47 +00:00
is = CHAIN_SURF_F2B (surf, tex->tex_chain);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
is->transform = bctx->transform;
is->color = bctx->color;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
static void
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
register_textures (mod_brush_t *brush, vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
texture_t *tex;
[util] Make bsp_t counts size_t and other bsp data counts unsigned, and clean up the resulting mess.
2021-08-01 12:54:05 +00:00
for (unsigned i = 0; i < brush->numtextures; i++) {
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
tex = brush->textures[i];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (!tex)
continue;
add_texture (tex, ctx);
}
}
static void
clear_textures (vulkan_ctx_t *ctx)
{
bspctx_t *bctx = ctx->bsp_context;
bctx->texture_chains.size = 0;
}
void
Vulkan_RegisterTextures (model_t **models, int num_models, vulkan_ctx_t *ctx)
{
int i;
model_t *m;
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
mod_brush_t *brush = &r_worldentity.renderer.model->brush;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
clear_textures (ctx);
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
init_surface_chains (brush, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
add_texture (r_notexture_mip, ctx);
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
register_textures (brush, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (i = 0; i < num_models; i++) {
m = models[i];
if (!m)
continue;
// sub-models are done as part of the main model
[model] Clean up the globals around model loading Covers only the generic load code (alias etc to follow), but this should take care of a lot of issues in the future.
2021-02-01 05:39:00 +00:00
if (*m->path == '*')
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
continue;
// world has already been done, not interested in non-brush models
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
if (m == r_worldentity.renderer.model || m->type != mod_brush)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
continue;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
brush = &m->brush;
brush->numsubmodels = 1; // no support for submodels in non-world model
register_textures (brush, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
}
static elechain_t *
[vulkan] Clean up some more unused bsp data Since vulkan supports 32-bit indexes, there's no need for the shenanigans the EGL-based glsl renderer had to go through to render bsp models (maps often had quite a bit more than 65536 vertices), though the reduced GPU memory requirements of 16-bit indices does have its advantages.
2021-07-19 14:38:09 +00:00
add_elechain (vulktex_t *tex, bspctx_t *bctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
elechain_t *ec;
ec = get_elechain (bctx);
ec->elements = get_elements (bctx);
ec->transform = 0;
ec->color = 0;
*tex->elechain_tail = ec;
tex->elechain_tail = &ec->next;
return ec;
}
static void
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
count_verts_inds (model_t **models, msurface_t *surf,
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
uint32_t *verts, uint32_t *inds)
{
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
*verts = surf->numedges;
*inds = surf->numedges + 1;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
}
static bsppoly_t *
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
build_surf_displist (model_t **models, msurface_t *surf, int base,
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
bspvert_t **vert_list)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
int numverts;
int numindices;
int i;
vec_t *vec;
mvertex_t *vertices;
medge_t *edges;
int *surfedges;
int index;
bspvert_t *verts;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
bsppoly_t *poly;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
uint32_t *ind;
float s, t;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
mod_brush_t *brush;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
if (surf->model_index < 0) {
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
// instance model
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
brush = &models[~surf->model_index]->brush;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
} else {
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
// main or sub model
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
brush = &r_worldentity.renderer.model->brush;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
vertices = brush->vertexes;
edges = brush->edges;
surfedges = brush->surfedges;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
// create a triangle fan
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
numverts = surf->numedges;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
numindices = numverts + 1;
verts = *vert_list;
[vulkan] Fix the bsp vertex index list creation There's still a problem with the vertex data itself not getting sent to the GPU properly, but vulkan is now happy with my tiny test map (which required disabling skies entirely until I get null textures working).
2021-01-21 05:37:39 +00:00
// surf->polys is set to the next slot before the call
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
poly = (bsppoly_t *) surf->polys;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
poly->count = numindices;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
for (i = 0, ind = poly->indices; i < numverts; i++) {
*ind++ = base + i;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
*ind++ = -1; // end of primitive
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
surf->polys = (glpoly_t *) poly;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
mtexinfo_t *texinfo = surf->texinfo;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (i = 0; i < numverts; i++) {
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
index = surfedges[surf->firstedge + i];
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
if (index > 0) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
vec = vertices[edges[index].v[0]].position;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
} else {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
vec = vertices[edges[-index].v[1]].position;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
s = DotProduct (vec, texinfo->vecs[0]) + texinfo->vecs[0][3];
t = DotProduct (vec, texinfo->vecs[1]) + texinfo->vecs[1][3];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
VectorCopy (vec, verts[i].vertex);
verts[i].vertex[3] = 1;
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
verts[i].tlst[0] = s / texinfo->texture->width;
verts[i].tlst[1] = t / texinfo->texture->height;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
//lightmap texture coordinates
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
if (!surf->lightpic) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
// sky and water textures don't have lightmaps
verts[i].tlst[2] = 0;
verts[i].tlst[3] = 0;
continue;
}
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
s = DotProduct (vec, texinfo->vecs[0]) + texinfo->vecs[0][3];
t = DotProduct (vec, texinfo->vecs[1]) + texinfo->vecs[1][3];
s -= surf->texturemins[0];
t -= surf->texturemins[1];
s += surf->lightpic->rect->x * 16 + 8;
t += surf->lightpic->rect->y * 16 + 8;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
s /= 16;
t /= 16;
[renderer] Be more consistent with msurface_t names Use "surf" everywhere in gl, glsl and vulkan. Not worried about sw/sw32 at this stage (I don't poke around in there anywhere near as much).
2021-07-15 12:38:12 +00:00
verts[i].tlst[2] = s * surf->lightpic->size;
verts[i].tlst[3] = t * surf->lightpic->size;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
*vert_list += numverts;
return (bsppoly_t *) &poly->indices[numindices];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
void
Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
{
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
qfv_device_t *device = ctx->device;
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
qfv_devfuncs_t *dfunc = device->funcs;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bspctx_t *bctx = ctx->bsp_context;
int vertex_index_base;
model_t *m;
dmodel_t *dm;
msurface_t *surf;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
qfv_stagebuf_t *stage;
bspvert_t *vertices;
bsppoly_t *poly;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
mod_brush_t *brush;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
bctx->sky_fix = (vec4f_t) { 0, 0, 1, 1 } * sqrtf (0.5);
bctx->sky_rotation[0] = (vec4f_t) { 0, 0, 0, 1};
bctx->sky_rotation[1] = bctx->sky_rotation[0];
bctx->sky_velocity = (vec4f_t) { };
bctx->sky_velocity = qexpf (bctx->sky_velocity);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bctx->sky_time = vr_data.realtime;
[vulkan] Clean up and document some of the bsp code Getting close to understanding (again) how it all works. I only just barely understood when I got vulkan's renderer running, but I really need to understand for when I modify things for shadows. The main thing hurdle was tinst, but that was dealt with in the previous commit, and now it's just sorting out the mess of elechains and elementss.
2021-07-13 13:59:51 +00:00
// run through all surfaces, chaining them to their textures, thus
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
// effectively sorting the surfaces by texture (without worrying about
// surface order on the same texture chain).
[util] Make bsp_t counts size_t and other bsp data counts unsigned, and clean up the resulting mess.
2021-08-01 12:54:05 +00:00
for (int i = 0; i < num_models; i++) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
m = models[i];
if (!m)
continue;
// sub-models are done as part of the main model
[vulkan] Clean up and document some of the bsp code Getting close to understanding (again) how it all works. I only just barely understood when I got vulkan's renderer running, but I really need to understand for when I modify things for shadows. The main thing hurdle was tinst, but that was dealt with in the previous commit, and now it's just sorting out the mess of elechains and elementss.
2021-07-13 13:59:51 +00:00
// and non-bsp models don't have surfaces.
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
if (*m->path == '*' || m->type != mod_brush)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
continue;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
brush = &m->brush;
dm = brush->submodels;
[util] Make bsp_t counts size_t and other bsp data counts unsigned, and clean up the resulting mess.
2021-08-01 12:54:05 +00:00
for (unsigned j = 0; j < brush->numsurfaces; j++) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
vulktex_t *tex;
if (j == dm->firstface + dm->numfaces) {
[vulkan] Clean up and document some of the bsp code Getting close to understanding (again) how it all works. I only just barely understood when I got vulkan's renderer running, but I really need to understand for when I modify things for shadows. The main thing hurdle was tinst, but that was dealt with in the previous commit, and now it's just sorting out the mess of elechains and elementss.
2021-07-13 13:59:51 +00:00
// move on to the next sub-model
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
dm++;
[build] Fix some windows bitrot
2021-08-02 05:02:41 +00:00
if (dm == brush->submodels + brush->numsubmodels) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
// limit the surfaces
// probably never hit
Sys_Printf ("R_BuildDisplayLists: too many surfaces\n");
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
brush->numsurfaces = j;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
break;
}
}
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
surf = brush->surfaces + j;
[vulkan] Clean up and document some of the bsp code Getting close to understanding (again) how it all works. I only just barely understood when I got vulkan's renderer running, but I really need to understand for when I modify things for shadows. The main thing hurdle was tinst, but that was dealt with in the previous commit, and now it's just sorting out the mess of elechains and elementss.
2021-07-13 13:59:51 +00:00
surf->model_index = dm - brush->submodels;
if (!surf->model_index && m != r_worldentity.renderer.model) {
surf->model_index = -1 - i; // instanced model
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
tex = surf->texinfo->texture->render;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
// append surf to the texture chain
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
CHAIN_SURF_F2B (surf, tex->tex_chain);
}
}
// All vertices from all brush models go into one giant vbo.
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
uint32_t vertex_count = 0;
uint32_t index_count = 0;
uint32_t poly_count = 0;
for (size_t i = 0; i < bctx->texture_chains.size; i++) {
vulktex_t *tex = bctx->texture_chains.a[i];
for (instsurf_t *is = tex->tex_chain; is; is = is->tex_chain) {
uint32_t verts, inds;
count_verts_inds (models, is->surface, &verts, &inds);
vertex_count += verts;
index_count += inds;
poly_count++;
}
}
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
[vulkan] Get wall rendering partially working Many surfaces are missing (I suspect it's due to transform stage management in the index emitter), and currently only the light maps are rendered (still not binding the correct textures), but the basics are working.
2021-01-21 17:20:32 +00:00
size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
size_t atom_mask = atom - 1;
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
size_t frames = bctx->frames.size;
size_t index_buffer_size = index_count * frames * sizeof (uint32_t);
size_t vertex_buffer_size = vertex_count * sizeof (bspvert_t);
[vulkan] Get wall rendering partially working Many surfaces are missing (I suspect it's due to transform stage management in the index emitter), and currently only the light maps are rendered (still not binding the correct textures), but the basics are working.
2021-01-21 17:20:32 +00:00
index_buffer_size = (index_buffer_size + atom_mask) & ~atom_mask;
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
stage = QFV_CreateStagingBuffer (device, "bsp", vertex_buffer_size,
ctx->cmdpool);
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
qfv_packet_t *packet = QFV_PacketAcquire (stage);
vertices = QFV_PacketExtend (packet, vertex_buffer_size);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
vertex_index_base = 0;
[vulkan] Clean up and document some of the bsp code Getting close to understanding (again) how it all works. I only just barely understood when I got vulkan's renderer running, but I really need to understand for when I modify things for shadows. The main thing hurdle was tinst, but that was dealt with in the previous commit, and now it's just sorting out the mess of elechains and elementss.
2021-07-13 13:59:51 +00:00
// holds all the polygon definitions: vertex indices + poly_count "end of
// primitive" markers.
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
bctx->polys = malloc ((index_count + poly_count) * sizeof (uint32_t));
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
// All usable surfaces have been chained to the (base) texture they use.
// Run through the textures, using their chains to build display maps.
// For animated textures, if a surface is on one texture of the group, it
// will be on all.
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
poly = bctx->polys;
int count = 0;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (size_t i = 0; i < bctx->texture_chains.size; i++) {
vulktex_t *tex;
instsurf_t *is;
tex = bctx->texture_chains.a[i];
for (is = tex->tex_chain; is; is = is->tex_chain) {
msurface_t *surf = is->surface;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
surf->polys = (glpoly_t *) poly;
poly = build_surf_displist (models, surf, vertex_index_base,
&vertices);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
vertex_index_base += surf->numedges;
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
count++;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
}
clear_texture_chains (bctx);
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_vulkan,
[vulkan] Clean up and document some of the bsp code Getting close to understanding (again) how it all works. I only just barely understood when I got vulkan's renderer running, but I really need to understand for when I modify things for shadows. The main thing hurdle was tinst, but that was dealt with in the previous commit, and now it's just sorting out the mess of elechains and elementss.
2021-07-13 13:59:51 +00:00
"R_BuildDisplayLists: verts:%u, inds:%u, "
"polys:%u (%d) %zd\n",
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
vertex_count, index_count, poly_count, count,
[vulkan] Clean up and document some of the bsp code Getting close to understanding (again) how it all works. I only just barely understood when I got vulkan's renderer running, but I really need to understand for when I modify things for shadows. The main thing hurdle was tinst, but that was dealt with in the previous commit, and now it's just sorting out the mess of elechains and elementss.
2021-07-13 13:59:51 +00:00
((size_t) poly - (size_t) bctx->polys) / sizeof(uint32_t));
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
if (index_buffer_size > bctx->index_buffer_size) {
if (bctx->index_buffer) {
dfunc->vkUnmapMemory (device->dev, bctx->index_memory);
dfunc->vkDestroyBuffer (device->dev, bctx->index_buffer, 0);
dfunc->vkFreeMemory (device->dev, bctx->index_memory, 0);
}
bctx->index_buffer
= QFV_CreateBuffer (device, index_buffer_size,
VK_BUFFER_USAGE_TRANSFER_DST_BIT
[vulkan] Bind the bsp main pipeline No drawing commands are issued yet, but vulkan seems to be happy with the state.
2021-01-20 07:51:35 +00:00
| VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, bctx->index_buffer,
"buffer:bsp:index");
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
bctx->index_memory
= QFV_AllocBufferMemory (device, bctx->index_buffer,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
index_buffer_size, 0);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
bctx->index_memory, "memory:bsp:index");
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
QFV_BindBufferMemory (device,
bctx->index_buffer, bctx->index_memory, 0);
bctx->index_buffer_size = index_buffer_size;
void *data;
dfunc->vkMapMemory (device->dev, bctx->index_memory, 0,
index_buffer_size, 0, &data);
uint32_t *index_data = data;
for (size_t i = 0; i < frames; i++) {
[vulkan] Bind the bsp main pipeline No drawing commands are issued yet, but vulkan seems to be happy with the state.
2021-01-20 07:51:35 +00:00
uint32_t offset = index_count * i;
bctx->frames.a[i].index_data = index_data + offset;
bctx->frames.a[i].index_offset = offset * sizeof (uint32_t);
[vulkan] Fix the bsp vertex index list creation There's still a problem with the vertex data itself not getting sent to the GPU properly, but vulkan is now happy with my tiny test map (which required disabling skies entirely until I get null textures working).
2021-01-21 05:37:39 +00:00
bctx->frames.a[i].index_count = 0;
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
}
}
if (vertex_buffer_size > bctx->vertex_buffer_size) {
if (bctx->vertex_buffer) {
dfunc->vkDestroyBuffer (device->dev, bctx->vertex_buffer, 0);
dfunc->vkFreeMemory (device->dev, bctx->vertex_memory, 0);
}
bctx->vertex_buffer
= QFV_CreateBuffer (device, vertex_buffer_size,
VK_BUFFER_USAGE_TRANSFER_DST_BIT
| VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER,
bctx->vertex_buffer, "buffer:bsp:vertex");
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
bctx->vertex_memory
= QFV_AllocBufferMemory (device, bctx->vertex_buffer,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
vertex_buffer_size, 0);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
bctx->vertex_memory, "memory:bsp:vertex");
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
QFV_BindBufferMemory (device,
bctx->vertex_buffer, bctx->vertex_memory, 0);
bctx->vertex_buffer_size = vertex_buffer_size;
}
[vulkan] Clean up buffer barriers a bit This even fixes a couple of minor issues that snuck past validation.
2021-04-24 06:47:31 +00:00
qfv_bufferbarrier_t bb = bufferBarriers[qfv_BB_Unknown_to_TransferWrite];
bb.barrier.buffer = bctx->vertex_buffer;
bb.barrier.size = vertex_buffer_size;
dfunc->vkCmdPipelineBarrier (packet->cmd, bb.srcStages, bb.dstStages,
0, 0, 0, 1, &bb.barrier, 0, 0);
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
VkBufferCopy copy_region = { packet->offset, 0, vertex_buffer_size };
[vulkan] Fix a pile of data upload issues Copying data from the wrong buffer was the cause of the corrupted brush model vertices, and then lots of little errors (mostly forgetting to multiply by bpp) for textures.
2021-01-21 12:24:54 +00:00
dfunc->vkCmdCopyBuffer (packet->cmd, stage->buffer,
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
bctx->vertex_buffer, 1, &copy_region);
[vulkan] Clean up buffer barriers a bit This even fixes a couple of minor issues that snuck past validation.
2021-04-24 06:47:31 +00:00
bb = bufferBarriers[qfv_BB_TransferWrite_to_VertexAttrRead];
bb.barrier.buffer = bctx->vertex_buffer;
bb.barrier.size = vertex_buffer_size;
dfunc->vkCmdPipelineBarrier (packet->cmd, bb.srcStages, bb.dstStages,
0, 0, 0, 1, &bb.barrier, 0, 0);
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
QFV_PacketSubmit (packet);
[vulkan] Generate triangle fans for bsp models They're not uploaded to the card yet, but the basics seem to be working.
2021-01-20 06:11:50 +00:00
QFV_DestroyStagingBuffer (stage);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
static void
R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
{
float dot, radius;
model_t *model;
plane_t *plane;
msurface_t *surf;
qboolean rotated;
[renderer] Remove more old fields from entity_t The only transform related field remaining is old_origin. This also brings the renderer closer to using simd (lots of stuff to fix still, though).
2021-03-19 11:18:45 +00:00
vec3_t mins, maxs;
vec4f_t org;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
mod_brush_t *brush;
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
bspctx_t *bctx = ctx->bsp_context;
bctx->entity = e;
bctx->transform = e->renderer.full_transform;
bctx->color = e->renderer.colormod;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
model = e->renderer.model;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
brush = &model->brush;
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
mat4f_t mat;
Transform_GetWorldMatrix (e->transform, mat);
memcpy (e->renderer.full_transform, mat, sizeof (mat));//FIXME
if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
rotated = true;
radius = model->radius;
[renderer] Remove more old fields from entity_t The only transform related field remaining is old_origin. This also brings the renderer closer to using simd (lots of stuff to fix still, though).
2021-03-19 11:18:45 +00:00
if (R_CullSphere (&mat[3][0], radius)) { //FIXME
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
return;
[renderer] Remove more old fields from entity_t The only transform related field remaining is old_origin. This also brings the renderer closer to using simd (lots of stuff to fix still, though).
2021-03-19 11:18:45 +00:00
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
} else {
rotated = false;
[renderer] Remove more old fields from entity_t The only transform related field remaining is old_origin. This also brings the renderer closer to using simd (lots of stuff to fix still, though).
2021-03-19 11:18:45 +00:00
VectorAdd (mat[3], model->mins, mins);
VectorAdd (mat[3], model->maxs, maxs);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (R_CullBox (mins, maxs))
return;
}
[renderer] Remove more old fields from entity_t The only transform related field remaining is old_origin. This also brings the renderer closer to using simd (lots of stuff to fix still, though).
2021-03-19 11:18:45 +00:00
org = r_refdef.viewposition - mat[3];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (rotated) {
[renderer] Remove more old fields from entity_t The only transform related field remaining is old_origin. This also brings the renderer closer to using simd (lots of stuff to fix still, though).
2021-03-19 11:18:45 +00:00
vec4f_t temp = org;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
org[0] = DotProduct (temp, mat[0]);
org[1] = DotProduct (temp, mat[1]);
org[2] = DotProduct (temp, mat[2]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
surf = &brush->surfaces[brush->firstmodelsurface];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[util] Make bsp_t counts size_t and other bsp data counts unsigned, and clean up the resulting mess.
2021-08-01 12:54:05 +00:00
for (unsigned i = 0; i < brush->nummodelsurfaces; i++, surf++) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
// find the node side on which we are
plane = surf->plane;
dot = PlaneDiff (org, plane);
// enqueue the polygon
if (((surf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON))
|| (!(surf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
chain_surface (surf, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
}
}
static inline void
visit_leaf (mleaf_t *leaf)
{
// deal with model fragments in this leaf
if (leaf->efrags)
R_StoreEfrags (leaf->efrags);
}
static inline int
get_side (mnode_t *node)
{
// find the node side on which we are
plane_t *plane = node->plane;
if (plane->type < 3)
return (r_origin[plane->type] - plane->dist) < 0;
return (DotProduct (r_origin, plane->normal) - plane->dist) < 0;
}
static inline void
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
visit_node (mod_brush_t *brush, mnode_t *node, int side, vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
int c;
msurface_t *surf;
// sneaky hack for side = side ? SURF_PLANEBACK : 0;
side = (~side + 1) & SURF_PLANEBACK;
// draw stuff
if ((c = node->numsurfaces)) {
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
surf = brush->surfaces + node->firstsurface;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (; c; c--, surf++) {
if (surf->visframe != r_visframecount)
continue;
// side is either 0 or SURF_PLANEBACK
if (side ^ (surf->flags & SURF_PLANEBACK))
continue; // wrong side
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
chain_surface (surf, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
}
}
static inline int
test_node (mnode_t *node)
{
if (node->contents < 0)
return 0;
if (node->visframe != r_visframecount)
return 0;
if (R_CullBox (node->minmaxs, node->minmaxs + 3))
return 0;
return 1;
}
static void
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
R_VisitWorldNodes (mod_brush_t *brush, vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
typedef struct {
mnode_t *node;
int side;
} rstack_t;
rstack_t *node_ptr;
rstack_t *node_stack;
mnode_t *node;
mnode_t *front;
int side;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
node = brush->nodes;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
// +2 for paranoia
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
node_stack = alloca ((brush->depth + 2) * sizeof (rstack_t));
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
node_ptr = node_stack;
while (1) {
while (test_node (node)) {
side = get_side (node);
front = node->children[side];
if (test_node (front)) {
node_ptr->node = node;
node_ptr->side = side;
node_ptr++;
node = front;
continue;
}
[vulkan] Add some comments and clean some code Figuring out bsp rendering for shadows is a fair bit harder than expected :P
2021-07-22 07:13:12 +00:00
// front is either not a node (ie, is a leaf) or is not visible
// if node is visible, then at least one of its child nodes
// must also be visible, and a leaf child in front of the node
// will be visible, so no need for vis checks on a leaf
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (front->contents < 0 && front->contents != CONTENTS_SOLID)
visit_leaf ((mleaf_t *) front);
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
visit_node (brush, node, side, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
node = node->children[!side];
}
if (node->contents < 0 && node->contents != CONTENTS_SOLID)
visit_leaf ((mleaf_t *) node);
if (node_ptr != node_stack) {
node_ptr--;
node = node_ptr->node;
side = node_ptr->side;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
visit_node (brush, node, side, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
node = node->children[!side];
continue;
}
break;
}
if (node->contents < 0 && node->contents != CONTENTS_SOLID)
visit_leaf ((mleaf_t *) node);
}
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
static void
bind_view (qfv_bsp_tex tex, VkImageView view, bspframe_t *bframe,
VkCommandBuffer cmd, VkPipelineLayout layout, qfv_devfuncs_t *dfunc)
{
bframe->imageInfo[tex].imageView = view;
dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
layout, 0, 1,
bframe->descriptors + tex
+ BSP_BUFFER_INFOS);
}
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
static void
push_transform (vec_t *transform, VkPipelineLayout layout,
qfv_devfuncs_t *dfunc, VkCommandBuffer cmd)
{
dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_VERTEX_BIT,
0, 16 * sizeof (float), transform);
}
static void
push_fragconst (fragconst_t *fragconst, VkPipelineLayout layout,
qfv_devfuncs_t *dfunc, VkCommandBuffer cmd)
{
dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_FRAGMENT_BIT,
[vulkan] Fix up commands for deferred rendering Nothing gets output yet (lighting and composite passes not implemented), but everything passes validation until exit (not destroying everything).
2021-02-23 06:43:02 +00:00
64, sizeof (fragconst_t), fragconst);//FIXME 64
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
}
static void
push_descriptors (int count, VkWriteDescriptorSet *descriptors,
VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
VkCommandBuffer cmd)
{
dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
layout, 0, count, descriptors);
}
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
static void
draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
VkCommandBuffer cmd)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
elements_t *el;
if (ec->transform) {
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
push_transform (ec->transform, layout, dfunc, cmd);
[vulkan] Reset model transform for world surfaces Fixes the misplaced walls.
2021-01-21 17:42:58 +00:00
} else {
//FIXME should cache current transform
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
push_transform (identity, layout, dfunc, cmd);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
for (el = ec->elements; el; el = el->next) {
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
if (!el->index_count)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
continue;
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
dfunc->vkCmdDrawIndexed (cmd, el->index_count, 1, el->first_index,
0, 0);
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
}
}
static void
reset_elechain (elechain_t *ec)
{
elements_t *el;
for (el = ec->elements; el; el = el->next) {
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
el->first_index = 0;
el->index_count = 0;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
}
static VkImageView
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
get_view (qfv_tex_t *tex, qfv_tex_t *default_tex)
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
{
if (tex) {
return tex->view;
}
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
if (default_tex) {
return default_tex->view;
}
return 0;
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
static void
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
bsp_begin_subpass (QFV_BspSubpass subpass, VkPipeline pipeline,
vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Rename vulkan_framebuffer_t It turns out I had conflated frame buffers with frames and wound up making a minor mess when separating the number of frames the renderer could have in flight from the number of swap-chain images. This is the first step towards correcting that mistake.
2021-02-05 01:22:32 +00:00
__auto_type cframe = &ctx->frames.a[ctx->curFrame];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
VkCommandBuffer cmd = bframe->cmdSet.a[subpass];
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
[vulkan] Bind the bsp main pipeline No drawing commands are issued yet, but vulkan seems to be happy with the state.
2021-01-20 07:51:35 +00:00
dfunc->vkResetCommandBuffer (cmd, 0);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
VkCommandBufferInheritanceInfo inherit = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
[vulkan] Use correct vertex shader for skys This gets skys rendering again, but their depth is incorrect.
2021-03-22 23:25:56 +00:00
ctx->renderpass, subpass_map[subpass],
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
cframe->framebuffer,
0, 0, 0,
};
VkCommandBufferBeginInfo beginInfo = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
};
[vulkan] Bind the bsp main pipeline No drawing commands are issued yet, but vulkan seems to be happy with the state.
2021-01-20 07:51:35 +00:00
dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
[vulkan] Label the drawing command buffers
2021-04-18 11:40:43 +00:00
QFV_duCmdBeginLabel (device, cmd, va (ctx->va_ctx, "bsp:%s",
bsp_pass_names[subpass]),
[vulkan] Use correct vertex shader for skys This gets skys rendering again, but their depth is incorrect.
2021-03-22 23:25:56 +00:00
{0, 0.5, 0.6, 1});
[vulkan] Bind the bsp main pipeline No drawing commands are issued yet, but vulkan seems to be happy with the state.
2021-01-20 07:51:35 +00:00
dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
pipeline);
[vulkan] Move viewport and scissor into vulkan_ctx Not only does it makes sense to centralize the setting of viewport and scissor, but it's actually necessary in order to fix the upside-down rendering on windows.
2021-03-31 14:38:49 +00:00
dfunc->vkCmdSetViewport (cmd, 0, 1, &ctx->viewport);
dfunc->vkCmdSetScissor (cmd, 0, 1, &ctx->scissor);
[vulkan] Bind the bsp main pipeline No drawing commands are issued yet, but vulkan seems to be happy with the state.
2021-01-20 07:51:35 +00:00
VkDeviceSize offsets[] = { 0 };
dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &bctx->vertex_buffer, offsets);
dfunc->vkCmdBindIndexBuffer (cmd, bctx->index_buffer, bframe->index_offset,
VK_INDEX_TYPE_UINT32);
[vulkan] Set main texture image view Glow map and sky sheet and cube need to wait until I can get some default textures going, but the world is rendering correctly otherwise (though a tad dark: need to do a gamma setting).
2021-01-23 04:51:09 +00:00
// push VP matrices
dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
bctx->layout,
0, 1, bframe->descriptors + 0);
// push static images
[vulkan] Use vkCmdPushDescriptorSetKHR for bsp This makes switching textures on the fly much easier.
2021-01-21 03:39:08 +00:00
dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
[vulkan] Set main texture image view Glow map and sky sheet and cube need to wait until I can get some default textures going, but the world is rendering correctly otherwise (though a tad dark: need to do a gamma setting).
2021-01-23 04:51:09 +00:00
bctx->layout,
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
0, 3, bframe->descriptors + 3);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
//XXX glsl_Fog_GetColor (fog);
//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
}
static void
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
bsp_end_subpass (VkCommandBuffer cmd, vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
[vulkan] Use correct vertex shader for skys This gets skys rendering again, but their depth is incorrect.
2021-03-22 23:25:56 +00:00
QFV_duCmdEndLabel (device, cmd);
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
dfunc->vkEndCommandBuffer (cmd);
}
static void
bsp_begin (vulkan_ctx_t *ctx)
{
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
//XXX quat_t fog;
bctx->default_color[3] = 1;
QuatCopy (bctx->default_color, bctx->last_color);
__auto_type cframe = &ctx->frames.a[ctx->curFrame];
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
DARRAY_APPEND (&cframe->cmdSets[QFV_passDepth],
bframe->cmdSet.a[QFV_bspDepth]);
DARRAY_APPEND (&cframe->cmdSets[QFV_passGBuffer],
bframe->cmdSet.a[QFV_bspGBuffer]);
//FIXME need per frame matrices
bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
bframe->imageInfo[0].imageView = 0; // set by tex chain loop
bframe->imageInfo[1].imageView = 0; // set by tex chain loop
bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex,
bctx->default_skysheet);
bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
bctx->default_skybox);
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
bsp_begin_subpass (QFV_bspDepth, bctx->depth, ctx);
bsp_begin_subpass (QFV_bspGBuffer, bctx->gbuf, ctx);
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
static void
bsp_end (vulkan_ctx_t *ctx)
{
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
bsp_end_subpass (bframe->cmdSet.a[QFV_bspDepth], ctx);
bsp_end_subpass (bframe->cmdSet.a[QFV_bspGBuffer], ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
static void
turb_begin (vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bctx->default_color[3] = bound (0, r_wateralpha->value, 1);
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
QuatCopy (bctx->default_color, bctx->last_color);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
__auto_type cframe = &ctx->frames.a[ctx->curFrame];
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
DARRAY_APPEND (&cframe->cmdSets[QFV_passTranslucent],
bframe->cmdSet.a[QFV_bspTurb]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
//FIXME need per frame matrices
bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
bframe->imageInfo[0].imageView = ctx->default_magenta->view;
bframe->imageInfo[1].imageView = ctx->default_magenta->view;
bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
bframe->imageInfo[3].imageView = bctx->default_skysheet->view;
bframe->imageInfo[4].imageView = bctx->default_skybox->view;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bsp_begin_subpass (QFV_bspTurb, bctx->turb, ctx);
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
static void
turb_end (vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bspctx_t *bctx = ctx->bsp_context;
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bsp_end_subpass (bframe->cmdSet.a[QFV_bspTurb], ctx);
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
static void
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
spin (mat4f_t mat, bspctx_t *bctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
vec4f_t q;
mat4f_t m;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
float blend;
while (vr_data.realtime - bctx->sky_time > 1) {
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
bctx->sky_rotation[0] = bctx->sky_rotation[1];
bctx->sky_rotation[1] = qmulf (bctx->sky_velocity,
bctx->sky_rotation[0]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bctx->sky_time += 1;
}
blend = bound (0, (vr_data.realtime - bctx->sky_time), 1);
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
q = Blend (bctx->sky_rotation[0], bctx->sky_rotation[1], blend);
q = normalf (qmulf (bctx->sky_fix, q));
mat4fidentity (mat);
VectorNegate (r_origin, mat[3]);
mat4fquat (m, q);
mmulf (mat, m, mat);
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
static void
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
sky_begin (vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bctx->default_color[3] = 1;
QuatCopy (bctx->default_color, bctx->last_color);
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
spin (ctx->matrices.sky_3d, bctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Rename vulkan_framebuffer_t It turns out I had conflated frame buffers with frames and wound up making a minor mess when separating the number of frames the renderer could have in flight from the number of swap-chain images. This is the first step towards correcting that mistake.
2021-02-05 01:22:32 +00:00
__auto_type cframe = &ctx->frames.a[ctx->curFrame];
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
DARRAY_APPEND (&cframe->cmdSets[QFV_passTranslucent],
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bframe->cmdSet.a[QFV_bspSky]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
//FIXME need per frame matrices
bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
bframe->imageInfo[0].imageView = ctx->default_magenta->view;
bframe->imageInfo[1].imageView = ctx->default_magenta->view;
bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex,
bctx->default_skysheet);
bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
bctx->default_skybox);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
if (bctx->skybox_tex) {
bsp_begin_subpass (QFV_bspSky, bctx->skybox, ctx);
} else {
bsp_begin_subpass (QFV_bspSky, bctx->skysheet, ctx);
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
static void
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
sky_end (vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
bspctx_t *bctx = ctx->bsp_context;
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bsp_end_subpass (bframe->cmdSet.a[QFV_bspSky], ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
static inline void
add_surf_elements (vulktex_t *tex, instsurf_t *is,
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
elechain_t **ec, elements_t **el,
bspctx_t *bctx, bspframe_t *bframe)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
[vulkan] Add some comments and clean some code Figuring out bsp rendering for shadows is a fair bit harder than expected :P
2021-07-22 07:13:12 +00:00
bsppoly_t *poly = (bsppoly_t *) is->surface->polys;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (!tex->elechain) {
[vulkan] Clean up some more unused bsp data Since vulkan supports 32-bit indexes, there's no need for the shenanigans the EGL-based glsl renderer had to go through to render bsp models (maps often had quite a bit more than 65536 vertices), though the reduced GPU memory requirements of 16-bit indices does have its advantages.
2021-07-19 14:38:09 +00:00
(*ec) = add_elechain (tex, bctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
(*ec)->transform = is->transform;
(*ec)->color = is->color;
(*el) = (*ec)->elements;
[vulkan] Fix the bsp vertex index list creation There's still a problem with the vertex data itself not getting sent to the GPU properly, but vulkan is now happy with my tiny test map (which required disabling skies entirely until I get null textures working).
2021-01-21 05:37:39 +00:00
(*el)->first_index = bframe->index_count;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
if (is->transform != (*ec)->transform || is->color != (*ec)->color) {
[vulkan] Clean up some more unused bsp data Since vulkan supports 32-bit indexes, there's no need for the shenanigans the EGL-based glsl renderer had to go through to render bsp models (maps often had quite a bit more than 65536 vertices), though the reduced GPU memory requirements of 16-bit indices does have its advantages.
2021-07-19 14:38:09 +00:00
(*ec) = add_elechain (tex, bctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
(*ec)->transform = is->transform;
(*ec)->color = is->color;
(*el) = (*ec)->elements;
[vulkan] Fix the bsp vertex index list creation There's still a problem with the vertex data itself not getting sent to the GPU properly, but vulkan is now happy with my tiny test map (which required disabling skies entirely until I get null textures working).
2021-01-21 05:37:39 +00:00
(*el)->first_index = bframe->index_count;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
memcpy (bframe->index_data + bframe->index_count,
poly->indices, poly->count * sizeof (poly->indices[0]));
(*el)->index_count += poly->count;
[vulkan] Fix the bsp vertex index list creation There's still a problem with the vertex data itself not getting sent to the GPU properly, but vulkan is now happy with my tiny test map (which required disabling skies entirely until I get null textures working).
2021-01-21 05:37:39 +00:00
bframe->index_count += poly->count;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
static void
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
build_tex_elechain (vulktex_t *tex, bspctx_t *bctx, bspframe_t *bframe)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
instsurf_t *is;
elechain_t *ec = 0;
elements_t *el = 0;
for (is = tex->tex_chain; is; is = is->tex_chain) {
[vulkan] Add some comments and clean some code Figuring out bsp rendering for shadows is a fair bit harder than expected :P
2021-07-22 07:13:12 +00:00
// emit the polygon indices for the the surface to the texture's
// element chain
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
add_surf_elements (tex, is, &ec, &el, bctx, bframe);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
}
void
Vulkan_DrawWorld (vulkan_ctx_t *ctx)
{
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
entity_t worldent;
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
mod_brush_t *brush;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
clear_texture_chains (bctx); // do this first for water and skys
[vulkan] Fix the bsp vertex index list creation There's still a problem with the vertex data itself not getting sent to the GPU properly, but vulkan is now happy with my tiny test map (which required disabling skies entirely until I get null textures working).
2021-01-21 05:37:39 +00:00
bframe->index_count = 0;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
memset (&worldent, 0, sizeof (worldent));
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
worldent.renderer.model = r_worldentity.renderer.model;
brush = &r_worldentity.renderer.model->brush;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
bctx->entity = &r_worldentity;
bctx->transform = 0;
bctx->color = 0;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[models] Move brush data into its own struct This is a big step towards a cleaner api. The struct reference in model_t really should be a pointer, but bsp submodel(?) loading messed that up, though that's just a matter of taking more care in the loading code. It seems sensible to make that a separate step.
2021-02-01 10:31:11 +00:00
R_VisitWorldNodes (brush, ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (r_drawentities->int_val) {
entity_t *ent;
for (ent = r_ent_queue; ent; ent = ent->next) {
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
if (ent->renderer.model->type != mod_brush)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
continue;
R_DrawBrushModel (ent, ctx);
}
}
bsp_begin (ctx);
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
push_transform (identity, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspDepth]);
push_transform (identity, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspGBuffer]);
[vulkan] Get sky sheets working The sky texture is loaded with black's alpha set to 0. While this does hit both layers, the screen is cleared to black so it shouldn't be a problem (and will allow having a skybox behind the sheets).
2021-01-23 14:58:34 +00:00
fragconst_t frag_constants = { time: vr_data.realtime };
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
push_fragconst (&frag_constants, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspGBuffer]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (size_t i = 0; i < bctx->texture_chains.size; i++) {
vulktex_t *tex;
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
elechain_t *ec = 0;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
tex = bctx->texture_chains.a[i];
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
build_tex_elechain (tex, bctx, bframe);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
bframe->imageInfo[0].imageView = get_view (tex->tex,
ctx->default_white);
bframe->imageInfo[1].imageView = get_view (tex->glow,
ctx->default_black);
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
push_descriptors (2, bframe->descriptors + 1, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspGBuffer]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
for (ec = tex->elechain; ec; ec = ec->next) {
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
draw_elechain (ec, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspDepth]);
draw_elechain (ec, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspGBuffer]);
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
reset_elechain (ec);
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
tex->elechain = 0;
tex->elechain_tail = &tex->elechain;
}
bsp_end (ctx);
[vulkan] Get wall rendering partially working Many surfaces are missing (I suspect it's due to transform stage management in the index emitter), and currently only the light maps are rendered (still not binding the correct textures), but the basics are working.
2021-01-21 17:20:32 +00:00
size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
size_t atom_mask = atom - 1;
size_t offset = bframe->index_offset;
size_t size = bframe->index_count * sizeof (uint32_t);
offset &= ~atom_mask;
size = (size + atom_mask) & ~atom_mask;
//FIXME this needs to come at the end of the frame after all passes
VkMappedMemoryRange range = {
VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
bctx->index_memory, offset, size
};
dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
void
Vulkan_DrawWaterSurfaces (vulkan_ctx_t *ctx)
{
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
bspctx_t *bctx = ctx->bsp_context;
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
instsurf_t *is;
vulktex_t *tex = 0;
elechain_t *ec = 0;
elements_t *el = 0;
if (!bctx->waterchain)
return;
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
turb_begin (ctx);
push_transform (identity, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspTurb]);
fragconst_t frag_constants = { time: vr_data.realtime };
push_fragconst (&frag_constants, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspTurb]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (is = bctx->waterchain; is; is = is->tex_chain) {
[vulkan] Add some comments and clean some code Figuring out bsp rendering for shadows is a fair bit harder than expected :P
2021-07-22 07:13:12 +00:00
msurface_t *surf = is->surface;
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
if (tex != surf->texinfo->texture->render) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (tex) {
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bind_view (qfv_bsp_texture,
get_view (tex->tex, ctx->default_black),
bframe,
bframe->cmdSet.a[QFV_bspTurb],
bctx->layout, dfunc);
for (ec = tex->elechain; ec; ec = ec->next) {
draw_elechain (ec, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspTurb]);
reset_elechain (ec);
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
tex->elechain = 0;
tex->elechain_tail = &tex->elechain;
}
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
tex = surf->texinfo->texture->render;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Add some comments and clean some code Figuring out bsp rendering for shadows is a fair bit harder than expected :P
2021-07-22 07:13:12 +00:00
// emit the polygon indices for the the surface to the texture's
// element chain
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
add_surf_elements (tex, is, &ec, &el, bctx, bframe);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
if (tex) {
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bind_view (qfv_bsp_texture, get_view (tex->tex, ctx->default_black),
bframe, bframe->cmdSet.a[QFV_bspTurb],
bctx->layout, dfunc);
for (ec = tex->elechain; ec; ec = ec->next) {
draw_elechain (ec, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspTurb]);
reset_elechain (ec);
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
tex->elechain = 0;
tex->elechain_tail = &tex->elechain;
}
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
turb_end (ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bctx->waterchain = 0;
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bctx->waterchain_tail = &bctx->waterchain;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
void
Vulkan_DrawSky (vulkan_ctx_t *ctx)
{
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
instsurf_t *is;
vulktex_t *tex = 0;
elechain_t *ec = 0;
elements_t *el = 0;
if (!bctx->sky_chain)
return;
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
sky_begin (ctx);
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
push_transform (identity, bctx->layout, dfunc,
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bframe->cmdSet.a[QFV_bspSky]);
[vulkan] Get sky sheets working The sky texture is loaded with black's alpha set to 0. While this does hit both layers, the screen is cleared to black so it shouldn't be a problem (and will allow having a skybox behind the sheets).
2021-01-23 14:58:34 +00:00
fragconst_t frag_constants = { time: vr_data.realtime };
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
push_fragconst (&frag_constants, bctx->layout, dfunc,
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bframe->cmdSet.a[QFV_bspSky]);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (is = bctx->sky_chain; is; is = is->tex_chain) {
[vulkan] Add some comments and clean some code Figuring out bsp rendering for shadows is a fair bit harder than expected :P
2021-07-22 07:13:12 +00:00
msurface_t *surf = is->surface;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (tex != surf->texinfo->texture->render) {
if (tex) {
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
bind_view (qfv_bsp_skysheet,
get_view (tex->tex, ctx->default_black),
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
bframe,
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bframe->cmdSet.a[QFV_bspSky],
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
bctx->layout, dfunc);
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
for (ec = tex->elechain; ec; ec = ec->next) {
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
draw_elechain (ec, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspSky]);
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
reset_elechain (ec);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
tex->elechain = 0;
tex->elechain_tail = &tex->elechain;
}
tex = surf->texinfo->texture->render;
}
[vulkan] Add some comments and clean some code Figuring out bsp rendering for shadows is a fair bit harder than expected :P
2021-07-22 07:13:12 +00:00
// emit the polygon indices for the the surface to the texture's
// element chain
[vulkan] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
add_surf_elements (tex, is, &ec, &el, bctx, bframe);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
if (tex) {
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
bind_view (qfv_bsp_skysheet, get_view (tex->tex, ctx->default_black),
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bframe, bframe->cmdSet.a[QFV_bspSky],
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
bctx->layout, dfunc);
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
for (ec = tex->elechain; ec; ec = ec->next) {
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
draw_elechain (ec, bctx->layout, dfunc,
bframe->cmdSet.a[QFV_bspSky]);
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
reset_elechain (ec);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
tex->elechain = 0;
tex->elechain_tail = &tex->elechain;
}
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
sky_end (ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
bctx->sky_chain = 0;
bctx->sky_chain_tail = &bctx->sky_chain;
}
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
static void
create_default_skys (vulkan_ctx_t *ctx)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
bspctx_t *bctx = ctx->bsp_context;
VkImage skybox;
VkImage skysheet;
VkDeviceMemory memory;
VkImageView boxview;
VkImageView sheetview;
bctx->default_skybox = calloc (2, sizeof (qfv_tex_t));
bctx->default_skysheet = bctx->default_skybox + 1;
VkExtent3D extents = { 1, 1, 1 };
skybox = QFV_CreateImage (device, 1, VK_IMAGE_TYPE_2D,
VK_FORMAT_B8G8R8A8_UNORM, extents, 1, 1,
VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_USAGE_SAMPLED_BIT
| VK_IMAGE_USAGE_TRANSFER_DST_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, skybox,
"bsp:image:default_skybox");
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
skysheet = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
VK_FORMAT_B8G8R8A8_UNORM, extents, 1, 2,
VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_USAGE_SAMPLED_BIT
| VK_IMAGE_USAGE_TRANSFER_DST_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, skysheet,
"bsp:image:default_skysheet");
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
VkMemoryRequirements requirements;
dfunc->vkGetImageMemoryRequirements (device->dev, skybox, &requirements);
size_t boxsize = requirements.size;
dfunc->vkGetImageMemoryRequirements (device->dev, skysheet, &requirements);
size_t sheetsize = requirements.size;
memory = QFV_AllocImageMemory (device, skybox,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
boxsize + sheetsize,
VK_IMAGE_USAGE_TRANSFER_DST_BIT
| VK_IMAGE_USAGE_SAMPLED_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, memory,
"bsp:memory:default_skys");
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
QFV_BindImageMemory (device, skybox, memory, 0);
QFV_BindImageMemory (device, skysheet, memory, boxsize);
boxview = QFV_CreateImageView (device, skybox, VK_IMAGE_VIEW_TYPE_CUBE,
VK_FORMAT_B8G8R8A8_UNORM,
VK_IMAGE_ASPECT_COLOR_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, boxview,
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
"bsp:iview:default_skybox");
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
sheetview = QFV_CreateImageView (device, skysheet,
VK_IMAGE_VIEW_TYPE_2D_ARRAY,
VK_FORMAT_B8G8R8A8_UNORM,
VK_IMAGE_ASPECT_COLOR_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, sheetview,
"bsp:iview:default_skysheet");
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
bctx->default_skybox->image = skybox;
bctx->default_skybox->view = boxview;
bctx->default_skybox->memory = memory;
bctx->default_skysheet->image = skysheet;
bctx->default_skysheet->view = sheetview;
// temporarily commandeer the light map's staging buffer
qfv_packet_t *packet = QFV_PacketAcquire (bctx->light_stage);
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
qfv_imagebarrier_t ib = imageBarriers[qfv_LT_Undefined_to_TransferDst];
ib.barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
ib.barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
VkImageMemoryBarrier barriers[2] = { ib.barrier, ib.barrier };
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
barriers[0].image = skybox;
barriers[1].image = skysheet;
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
0, 0, 0, 0, 0,
2, barriers);
VkClearColorValue color = {};
VkImageSubresourceRange range = {
VK_IMAGE_ASPECT_COLOR_BIT,
0, VK_REMAINING_MIP_LEVELS,
0, VK_REMAINING_ARRAY_LAYERS
};
dfunc->vkCmdClearColorImage (packet->cmd, skybox,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
&color, 1, &range);
dfunc->vkCmdClearColorImage (packet->cmd, skysheet,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
&color, 1, &range);
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
ib = imageBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
ib.barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
ib.barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
barriers[0] = ib.barrier;
barriers[1] = ib.barrier;
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
barriers[0].image = skybox;
barriers[1].image = skysheet;
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
0, 0, 0, 0, 0,
2, barriers);
QFV_PacketSubmit (packet);
}
[vulkan] Set main texture image view Glow map and sky sheet and cube need to wait until I can get some default textures going, but the world is rendering correctly otherwise (though a tad dark: need to do a gamma setting).
2021-01-23 04:51:09 +00:00
static VkDescriptorBufferInfo base_buffer_info = {
0, 0, VK_WHOLE_SIZE
};
static VkDescriptorImageInfo base_image_info = {
0, 0, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
};
static VkWriteDescriptorSet base_buffer_write = {
VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
0, 0, 1,
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
0, 0, 0
};
static VkWriteDescriptorSet base_image_write = {
VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
0, 0, 1,
VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
0, 0, 0
};
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
void
Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
{
qfv_device_t *device = ctx->device;
bspctx_t *bctx = calloc (1, sizeof (bspctx_t));
ctx->bsp_context = bctx;
bctx->waterchain_tail = &bctx->waterchain;
bctx->sky_chain_tail = &bctx->sky_chain;
bctx->static_instsurfs_tail = &bctx->static_instsurfs;
bctx->elechains_tail = &bctx->elechains;
bctx->elementss_tail = &bctx->elementss;
bctx->instsurfs_tail = &bctx->instsurfs;
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
bctx->light_scrap = QFV_CreateScrap (device, "lightmap_atlas", 2048,
tex_frgba, ctx->staging);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
size_t size = QFV_ScrapSize (bctx->light_scrap);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
bctx->light_stage = QFV_CreateStagingBuffer (device, "lightmap", size,
ctx->cmdpool);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
create_default_skys (ctx);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
DARRAY_INIT (&bctx->texture_chains, 64);
[vulkan] Rename vulkan_framebuffer_t It turns out I had conflated frame buffers with frames and wound up making a minor mess when separating the number of frames the renderer could have in flight from the number of swap-chain images. This is the first step towards correcting that mistake.
2021-02-05 01:22:32 +00:00
size_t frames = ctx->frames.size;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
DARRAY_INIT (&bctx->frames, frames);
DARRAY_RESIZE (&bctx->frames, frames);
bctx->frames.grow = 0;
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
bctx->depth = Vulkan_CreatePipeline (ctx, "bsp_depth");
bctx->gbuf = Vulkan_CreatePipeline (ctx, "bsp_gbuf");
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
bctx->skybox = Vulkan_CreatePipeline (ctx, "bsp_skybox");
bctx->skysheet = Vulkan_CreatePipeline (ctx, "bsp_skysheet");
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bctx->turb = Vulkan_CreatePipeline (ctx, "bsp_turb");
[vulkan] Rework pipeline parsing for better reuse It's not entirely there yet, but the basics are working. Work is still needed for avoiding duplication of objects (different threads will have different contexts and thus different tables, so necessary per-thread duplication should not become a problem) and general access to arbitrary fields (mostly just parsing the strings)
2021-02-04 08:03:49 +00:00
bctx->layout = Vulkan_CreatePipelineLayout (ctx, "quakebsp_layout");
bctx->sampler = Vulkan_CreateSampler (ctx, "quakebsp_sampler");
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (size_t i = 0; i < frames; i++) {
__auto_type bframe = &bctx->frames.a[i];
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
DARRAY_INIT (&bframe->cmdSet, QFV_bspNumPasses);
DARRAY_RESIZE (&bframe->cmdSet, QFV_bspNumPasses);
bframe->cmdSet.grow = 0;
QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, &bframe->cmdSet);
for (int j = 0; j < QFV_bspNumPasses; j++) {
QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
bframe->cmdSet.a[i],
va (ctx->va_ctx, "cmd:bsp:%zd:%s", i,
bsp_pass_names[j]));
}
[vulkan] Set main texture image view Glow map and sky sheet and cube need to wait until I can get some default textures going, but the world is rendering correctly otherwise (though a tad dark: need to do a gamma setting).
2021-01-23 04:51:09 +00:00
for (int j = 0; j < BSP_BUFFER_INFOS; j++) {
bframe->bufferInfo[j] = base_buffer_info;
bframe->descriptors[j] = base_buffer_write;
bframe->descriptors[j].dstBinding = j;
bframe->descriptors[j].pBufferInfo = &bframe->bufferInfo[j];
}
for (int j = 0; j < BSP_IMAGE_INFOS; j++) {
bframe->imageInfo[j] = base_image_info;
bframe->imageInfo[j].sampler = bctx->sampler;
int k = j + BSP_BUFFER_INFOS;
bframe->descriptors[k] = base_image_write;
bframe->descriptors[k].dstBinding = k;
bframe->descriptors[k].pImageInfo = &bframe->imageInfo[j];
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
}
void
Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
bspctx_t *bctx = ctx->bsp_context;
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
for (size_t i = 0; i < bctx->frames.size; i++) {
__auto_type bframe = &bctx->frames.a[i];
free (bframe->cmdSet.a);
}
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
dfunc->vkDestroyPipeline (device->dev, bctx->depth, 0);
dfunc->vkDestroyPipeline (device->dev, bctx->gbuf, 0);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
dfunc->vkDestroyPipeline (device->dev, bctx->skybox, 0);
dfunc->vkDestroyPipeline (device->dev, bctx->skysheet, 0);
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
dfunc->vkDestroyPipeline (device->dev, bctx->turb, 0);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
DARRAY_CLEAR (&bctx->texture_chains);
DARRAY_CLEAR (&bctx->frames);
QFV_DestroyStagingBuffer (bctx->light_stage);
QFV_DestroyScrap (bctx->light_scrap);
[vulkan] Create a populate the vertex buffer And create/map the index buffer.
2021-01-20 07:28:04 +00:00
if (bctx->vertex_buffer) {
dfunc->vkDestroyBuffer (device->dev, bctx->vertex_buffer, 0);
dfunc->vkFreeMemory (device->dev, bctx->vertex_memory, 0);
}
if (bctx->index_buffer) {
dfunc->vkDestroyBuffer (device->dev, bctx->index_buffer, 0);
dfunc->vkFreeMemory (device->dev, bctx->index_memory, 0);
}
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
if (bctx->skybox_tex) {
Vulkan_UnloadTex (ctx, bctx->skybox_tex);
}
[vulkan] Get sky sheets mostly working They render (incorrectly because the images weren't translated correctly), but aren't animated (haven't pushed the time constant)
2021-01-23 11:42:53 +00:00
dfunc->vkDestroyImageView (device->dev, bctx->default_skysheet->view, 0);
dfunc->vkDestroyImage (device->dev, bctx->default_skysheet->image, 0);
dfunc->vkDestroyImageView (device->dev, bctx->default_skybox->view, 0);
dfunc->vkDestroyImage (device->dev, bctx->default_skybox->image, 0);
dfunc->vkFreeMemory (device->dev, bctx->default_skybox->memory, 0);
free (bctx->default_skybox);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
static inline __attribute__((const)) int
is_pow2 (unsigned x)
{
int count;
for (count = 0; x; x >>= 1)
if (x & 1)
count++;
return count == 1;
}
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
void
Vulkan_LoadSkys (const char *sky, vulkan_ctx_t *ctx)
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
{
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
bspctx_t *bctx = ctx->bsp_context;
const char *name;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
int i;
tex_t *tex;
static const char *sky_suffix[] = { "ft", "bk", "up", "dn", "rt", "lf"};
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
if (bctx->skybox_tex) {
Vulkan_UnloadTex (ctx, bctx->skybox_tex);
}
bctx->skybox_tex = 0;
if (!sky || !*sky) {
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
sky = r_skyname->string;
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
if (!*sky || !strcasecmp (sky, "none")) {
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_vulkan, "Skybox unloaded\n");
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
return;
}
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
name = va (ctx->va_ctx, "env/%s_map", sky);
tex = LoadImage (name, 1);
if (tex) {
bctx->skybox_tex = Vulkan_LoadEnvMap (ctx, tex, sky);
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_vulkan, "Loaded %s\n", name);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
} else {
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
int failed = 0;
tex_t *sides[6] = { };
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
for (i = 0; i < 6; i++) {
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
name = va (ctx->va_ctx, "env/%s%s", sky, sky_suffix[i]);
tex = LoadImage (name, 1);
if (!tex) {
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_vulkan, "Couldn't load %s\n", name);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
// also look in gfx/env, where Darkplaces looks for skies
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
name = va (ctx->va_ctx, "gfx/env/%s%s", sky, sky_suffix[i]);
tex = LoadImage (name, 1);
if (!tex) {
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_vulkan, "Couldn't load %s\n", name);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
failed = 1;
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
continue;
}
}
[vulkan] Don't lose other sky cube faces Because LoadImage uses Hunk_TempAlloc, the face images need to be copied individually. Really, what's neeeded is to be able to load the image data into a pre-allocated buffer (ideally, the staging buffer for vulkan, but that's for later).
2021-04-24 23:38:48 +00:00
//FIXME find a better way (also, assumes data and struct together)
sides[i] = malloc (ImageSize (tex, 1));
memcpy (sides[i], tex, ImageSize (tex, 1));
sides[i]->data = (byte *)(sides[i] + 1);
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_vulkan, "Loaded %s\n", name);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
}
if (!failed) {
bctx->skybox_tex = Vulkan_LoadEnvSides (ctx, sides, sky);
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Don't lose other sky cube faces Because LoadImage uses Hunk_TempAlloc, the face images need to be copied individually. Really, what's neeeded is to be able to load the image data into a pre-allocated buffer (ideally, the staging buffer for vulkan, but that's for later).
2021-04-24 23:38:48 +00:00
for (i = 0; i < 6; i++) {
free (sides[i]);
}
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
}
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
if (bctx->skybox_tex) {
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_vulkan, "Skybox %s loaded\n", sky);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
}
}
Reference in a new issue Copy permalink