qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-27 14:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/include/QF/Vulkan/qf_bsp.h

225 lines
5.4 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
/*
qf_bsp.h
Vulkan specific brush model stuff
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
*/
#ifndef __QF_Vulkan_qf_bsp_h
#define __QF_Vulkan_qf_bsp_h
#include "QF/darray.h"
#include "QF/model.h"
#include "QF/Vulkan/qf_vid.h"
[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
#include "QF/Vulkan/command.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
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
#include "QF/simd/types.h"
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
typedef struct bsp_face_s {
uint32_t first_index;
uint32_t index_count;
uint32_t tex_id;
uint32_t flags;
} bsp_face_t;
[vulkan] Use instanced rendering for brush models The models are broken up into N sub-(sub-)models, one for each texture, but all faces using the same texture are drawn as an instance, making for both reduced draw calls and reduced index buffer use (and thus, hopefully, reduced bandwidth). While texture animations are broken, this does mark a significant milestone towards implementing shadows as it should now be possible to use multiple threads (with multiple index and entid buffers) to render the depth buffers for all the lights.
2022-05-25 04:29:11 +00:00
typedef struct bsp_model_s {
uint32_t first_face;
uint32_t face_count;
} bsp_model_t;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
typedef struct bsp_packet_s {
int first_index;
int index_count;
int transform_id;
int color_id;
} bsp_packet_t;
typedef struct bsp_packetset_s
DARRAY_TYPE (bsp_packet_t) bsp_packetset_t;
typedef struct bsp_indexset_s
DARRAY_TYPE (uint32_t) bsp_indexset_t;
typedef struct bsp_tex_s {
VkDescriptorSet descriptors;
bsp_packetset_t packets;
bsp_indexset_t indices;
} bsp_tex_t;
[renderer] Move driver specific texture chain defs The GL/GLSL/Vulklan texture chaining defs never should have been in r_internal.h in the first place. They still need a better name, though.
2021-07-21 07:36:51 +00:00
typedef struct vulktex_s {
struct qfv_tex_s *tex;
[vulkan] Abandon bindless rendering At least for now, it is more trouble than it is worth as it (or my implementation of it) breaks lavapipe and renderdoc.
2021-12-17 03:20:32 +00:00
VkDescriptorSet descriptor;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
int tex_id;
[renderer] Move driver specific texture chain defs The GL/GLSL/Vulklan texture chaining defs never should have been in r_internal.h in the first place. They still need a better name, though.
2021-07-21 07:36:51 +00:00
} vulktex_t;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
typedef struct regtexset_s
DARRAY_TYPE (vulktex_t *) regtexset_t;
typedef struct bsp_texset_s
DARRAY_TYPE (bsp_tex_t) bsp_texset_t;
typedef struct bsp_draw_s {
uint32_t tex_id;
[vulkan] Use instanced rendering for brush models The models are broken up into N sub-(sub-)models, one for each texture, but all faces using the same texture are drawn as an instance, making for both reduced draw calls and reduced index buffer use (and thus, hopefully, reduced bandwidth). While texture animations are broken, this does mark a significant milestone towards implementing shadows as it should now be possible to use multiple threads (with multiple index and entid buffers) to render the depth buffers for all the lights.
2022-05-25 04:29:11 +00:00
uint32_t inst_id;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
uint32_t index_count;
uint32_t instance_count;
uint32_t first_index;
uint32_t first_instance;
} bsp_draw_t;
typedef struct bsp_drawset_s
DARRAY_TYPE (bsp_draw_t) bsp_drawset_t;
typedef struct instface_s {
uint32_t inst_id;
uint32_t face;
} instface_t;
typedef struct bsp_instfaceset_s
DARRAY_TYPE (instface_t) bsp_instfaceset_t;
[vulkan] Use instanced rendering for brush models The models are broken up into N sub-(sub-)models, one for each texture, but all faces using the same texture are drawn as an instance, making for both reduced draw calls and reduced index buffer use (and thus, hopefully, reduced bandwidth). While texture animations are broken, this does mark a significant milestone towards implementing shadows as it should now be possible to use multiple threads (with multiple index and entid buffers) to render the depth buffers for all the lights.
2022-05-25 04:29:11 +00:00
typedef struct bsp_modelentset_s
DARRAY_TYPE (uint32_t) bsp_modelentset_t;
typedef struct bsp_instance_s {
int first_instance;
bsp_modelentset_t entities;
} bsp_instance_t;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
typedef struct bsp_pass_s {
uint32_t *indices; // points into index buffer
uint32_t index_count; // number of indices written to buffer
[vulkan] Use a buffer for entity transform and color data This allows the use of an entity id to index into the entity data and fetch the transform and colormod data in the vertex shader, thus making instanced rendering possible. Non-world brush entities are still not rendered, but the world entity is using both the entity data buffer and entid buffer.
2022-05-24 15:17:57 +00:00
uint32_t *entid_data;
uint32_t entid_count;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
int vis_frame;
int *face_frames;
int *leaf_frames;
int *node_frames;
bsp_instfaceset_t *face_queue;
regtexset_t *textures;
int num_queues;
bsp_drawset_t *draw_queues;
[vulkan] Use instanced rendering for brush models The models are broken up into N sub-(sub-)models, one for each texture, but all faces using the same texture are drawn as an instance, making for both reduced draw calls and reduced index buffer use (and thus, hopefully, reduced bandwidth). While texture animations are broken, this does mark a significant milestone towards implementing shadows as it should now be possible to use multiple threads (with multiple index and entid buffers) to render the depth buffers for all the lights.
2022-05-25 04:29:11 +00:00
uint32_t inst_id;
bsp_instance_t *instances;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
} bsp_pass_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
typedef struct bspvert_s {
quat_t vertex;
quat_t tlst;
} bspvert_t;
[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
typedef enum {
qfv_bsp_texture,
qfv_bsp_glowmap,
qfv_bsp_lightmap,
qfv_bsp_skysheet,
qfv_bsp_skycube,
} qfv_bsp_tex;
[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
[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
typedef enum {
[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
QFV_bspDepth,
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_bspSky,
QFV_bspTurb,
[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
QFV_bspNumPasses
[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
} QFV_BspSubpass;
[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
typedef struct bspframe_s {
[vulkan] Use a buffer for entity transform and color data This allows the use of an entity id to index into the entity data and fetch the transform and colormod data in the vertex shader, thus making instanced rendering possible. Non-world brush entities are still not rendered, but the world entity is using both the entity data buffer and entid buffer.
2022-05-24 15:17:57 +00:00
uint32_t *index_data; // pointer into mega-buffer for this frame (c)
uint32_t index_offset; // offset of index_data within mega-buffer (c)
uint32_t index_count; // number if indices queued (d)
uint32_t *entid_data;
uint32_t entid_offset;
uint32_t entid_count;
[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
qfv_cmdbufferset_t cmdSet;
[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;
typedef struct bspframeset_s
DARRAY_TYPE (bspframe_t) bspframeset_t;
typedef struct bspctx_s {
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
regtexset_t registered_textures;
[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
struct qfv_tex_s *default_skysheet;
[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
struct qfv_tex_s *skysheet_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
struct qfv_tex_s *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
struct qfv_tex_s *skybox_tex;
[vulkan] Abandon bindless rendering At least for now, it is more trouble than it is worth as it (or my implementation of it) breaks lavapipe and renderdoc.
2021-12-17 03:20:32 +00:00
VkDescriptorSet skybox_descriptor;
[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
quat_t default_color;
quat_t last_color;
struct scrap_s *light_scrap;
struct qfv_stagebuf_s *light_stage;
[vulkan] Use instanced rendering for brush models The models are broken up into N sub-(sub-)models, one for each texture, but all faces using the same texture are drawn as an instance, making for both reduced draw calls and reduced index buffer use (and thus, hopefully, reduced bandwidth). While texture animations are broken, this does mark a significant milestone towards implementing shadows as it should now be possible to use multiple threads (with multiple index and entid buffers) to render the depth buffers for all the lights.
2022-05-25 04:29:11 +00:00
bsp_model_t *models;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
bsp_face_t *faces;
uint32_t *poly_indices;
[vulkan] Use instanced rendering for brush models The models are broken up into N sub-(sub-)models, one for each texture, but all faces using the same texture are drawn as an instance, making for both reduced draw calls and reduced index buffer use (and thus, hopefully, reduced bandwidth). While texture animations are broken, this does mark a significant milestone towards implementing shadows as it should now be possible to use multiple threads (with multiple index and entid buffers) to render the depth buffers for all the lights.
2022-05-25 04:29:11 +00:00
int model_id;
[vulkan] Implement thread-safe rendering for the world model Sub-models and instance models need an instance data buffer, but this gets the basics working (and the proof of concept). Using arrays like this actually simplified a lot of the code, and will make it easy to get transparency without turbulence (just another queue).
2022-05-22 16:28:43 +00:00
bsp_pass_t main_pass; // camera view depth, gbuffer, etc
[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] Build brush model display lists Not working particularly well yet, but no errors out of validation.
2021-01-20 17:13:40 +00:00
VkSampler sampler;
[vulkan] Switch bsp renderer to multi-texture I guess it's not quite bindless as the texture index is a push constant, but it seems to work well (and I may have fixed some full-bright issues by accident, though I suspect that's just my imagination, but they do look good).
2021-12-08 12:11:36 +00:00
VkPipelineLayout layout;
[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
VkDeviceMemory texture_memory;
[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
VkPipeline depth;
VkPipeline 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
VkPipeline skysheet;
VkPipeline skybox;
[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
VkPipeline turb;
[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 vertex_buffer_size;
size_t index_buffer_size;
VkBuffer vertex_buffer;
VkDeviceMemory vertex_memory;
VkBuffer index_buffer;
VkDeviceMemory index_memory;
[vulkan] Use a buffer for entity transform and color data This allows the use of an entity id to index into the entity data and fetch the transform and colormod data in the vertex shader, thus making instanced rendering possible. Non-world brush entities are still not rendered, but the world entity is using both the entity data buffer and entid buffer.
2022-05-24 15:17:57 +00:00
VkBuffer entid_buffer;
VkDeviceMemory entid_memory;
[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
bspframeset_t frames;
} bspctx_t;
struct vulkan_ctx_s;
[vulkan] Support multiple render passes Multiple render passes are needed for supporting shadow mapping, and this is a huge step towards breaking the Vulkan render free of Quake, and hopefully will lead the way for breaking the GL renderers free as well.
2021-12-02 12:58:29 +00:00
struct qfv_renderframe_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
void Vulkan_ClearElements (struct vulkan_ctx_s *ctx);
[vulkan] Support multiple render passes Multiple render passes are needed for supporting shadow mapping, and this is a huge step towards breaking the Vulkan render free of Quake, and hopefully will lead the way for breaking the GL renderers free as well.
2021-12-02 12:58:29 +00:00
void Vulkan_DrawWorld (struct qfv_renderframe_s *rFrame);
void Vulkan_DrawSky (struct qfv_renderframe_s *rFrame);
void Vulkan_DrawWaterSurfaces (struct qfv_renderframe_s *rFrame);
[vulkan] Flush bsp vertex indices after all drawing
2021-12-17 06:52:17 +00:00
void Vulkan_Bsp_Flush (struct vulkan_ctx_s *ctx);
[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, struct vulkan_ctx_s *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
void Vulkan_RegisterTextures (model_t **models, int num_models,
struct vulkan_ctx_s *ctx);
void Vulkan_BuildDisplayLists (model_t **models, int num_models,
struct vulkan_ctx_s *ctx);
void Vulkan_Bsp_Init (struct vulkan_ctx_s *ctx);
void Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx);
#endif//__QF_Vulkan_qf_bsp_h
Reference in a new issue Copy permalink