qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-12-11 05:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/include/QF/Vulkan/qf_lighting.h

146 lines
3.8 KiB
C
Raw Normal View History

[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
/*
qf_lighting.h
Vulkan lighting pass
Copyright (C) 2021 Bill Currie <bill@taniwha.org>
Author: Bill Currie <bill@taniwha.org>
Date: 2021/2/23
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_lighting_h
#define __QF_Vulkan_qf_lighting_h
#include "QF/darray.h"
#include "QF/model.h"
#include "QF/modelgen.h"
[vulkan] Move non-specific lighting code out of Vulkan The parsing of light data from maps is now in the client library, and basic light management is in scene. Putting the light loading code into the Vulkan renderer was a mistake I've wanted to correct for a while. The client code still needs a bit of cleanup, but the basics are working nicely.
2022-05-05 05:58:47 +00:00
#include "QF/scene/light.h"
[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
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/command.h"
[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/Vulkan/image.h"
[vulkan] Hook up a shadow render job step It doesn't do much yet, but did help in getting light ids working.
2023-07-24 01:23:05 +00:00
#include "QF/Vulkan/render.h"
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
#include "QF/simd/types.h"
[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
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
typedef struct qfv_lightmatset_s DARRAY_TYPE (mat4f_t) qfv_lightmatset_t;
[vulkan] Load the map's lights into an array It's not used yet as work needs to be done to better support generic entities, but this is the next step to real-time lighting (though, to be honest, I expect it will be too slow to be usable).
2021-03-03 09:14:16 +00:00
[vulkan] Up the light limit to 768 For now, at least (I have some ideas to possibly reduce the numbers and also to avoid the need for actual limits). I've seen gmsp3v2 use over 500 lights at once (it has over 1300), and I spent too long figuring out that weird light behavior was due to the limit being hit and lights getting dropped (and even longer figuring out that more weird behavior was due to the lack of shadows and the world being too bright in the first place).
2022-05-10 01:47:51 +00:00
#define MaxLights 768
[vulkan] Create shadow maps and basic data I will definitely need to look into sparse images later (2.3GB for marcher) but the shadow map images, views and matrices are created.
2021-04-29 11:54:38 +00:00
[vulkan] Rework lighting model to be more algebraic This leaves only the one conditional in the shader code, that being the distance check. It doesn't seem to make any noticeable difference to performance, but other than explosion sprites being blue, lighting quality seems to have improved. However, I really need to get shadows working: marcher is just silly-bright without them, and light levels changing as I move around is a bit disconcerting (but reasonable as those lights' leaf nodes go in and out of visibility).
2022-05-04 23:40:02 +00:00
#define ST_NONE 0 // no shadows
#define ST_PLANE 1 // single plane shadow map (small spotlight)
#define ST_CASCADE 2 // cascaded shadow maps
#define ST_CUBE 3 // cubemap (omni, large spotlight)
[vulkan] Create shadow maps and basic data I will definitely need to look into sparse images later (2.3GB for marcher) but the shadow map images, views and matrices are created.
2021-04-29 11:54:38 +00:00
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
typedef struct qfv_lightid_buffer_s {
uint32_t lightCount;
uint32_t lightIds[MaxLights];
} qfv_lightid_buffer_t;
typedef struct qfv_light_render_s {
// mat_id (13) map_id (5) layer (11) type (2)
uint32_t id_data;
// light style (6)
uint32_t style;
} qfv_light_render_t;
[vulkan] Implement deferred lighting for dlights Static lights are yet to come (so the screen is black most of the time), but dynamic lights work very nicely (and look very good) despite the falloff being incorrect.
2021-02-25 06:51:54 +00:00
[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
#define LIGHTING_BUFFER_INFOS 1
[vulkan] Remove depth buffer from lighting pass It's not needed and exceeds the minimum maximum input attachments.
2023-08-01 04:32:46 +00:00
#define LIGHTING_ATTACH_INFOS 4
[vulkan] Limit shadow textures to 32 This is the minimum maximum count for sampled images, and with layered shadow maps (with a minimum of 2048 layers supported), that's really way more than enough.
2022-11-25 04:35:07 +00:00
#define LIGHTING_SHADOW_INFOS 32
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
#define LIGHTING_DESCRIPTORS (LIGHTING_BUFFER_INFOS + LIGHTING_ATTACH_INFOS + 1)
[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
[vulkan] Run the shadow render passes The shadow maps are rendered incorrectly because the matrices aren't set correctly yet, but the dual-pass bsp rendering is working.
2023-07-28 16:17:53 +00:00
typedef struct qfv_framebufferset_s
DARRAY_TYPE (VkFramebuffer) qfv_framebufferset_t;
[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
typedef struct lightingframe_s {
[vulkan] Upload light matrices for shadow maps This involved rewriting the descriptor update code too, but that now feels cleaner. The matrices are loaded into a storage buffer as it can get quite big at 6 matrices per light (and the current max lights is 768).
2023-07-30 02:28:42 +00:00
VkDescriptorSet shadowmat_set;
VkDescriptorSet lights_set;
VkDescriptorSet attach_set;
VkBuffer shadowmat_buffer;
VkBuffer light_buffer;
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
VkBuffer render_buffer;
VkBuffer style_buffer;
[vulkan] Rework lighting to use splats It's currently slower, and the cone splats are buggy, but the lighting code itself got some nice cleanups.
2023-06-27 16:01:56 +00:00
VkBuffer id_buffer;
uint32_t ico_count;
uint32_t cone_count;
uint32_t flat_count;
[vulkan] Run the shadow render passes The shadow maps are rendered incorrectly because the matrices aren't set correctly yet, but the dual-pass bsp rendering is working.
2023-07-28 16:17:53 +00:00
qfv_imageviewset_t views;
qfv_framebufferset_t framebuffers;
[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
} lightingframe_t;
typedef struct lightingframeset_s
DARRAY_TYPE (lightingframe_t) lightingframeset_t;
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
typedef struct light_control_s {
[vulkan] Hook up a shadow render job step It doesn't do much yet, but did help in getting light ids working.
2023-07-24 01:23:05 +00:00
uint8_t renderpass_index;
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
uint8_t map_index;
[vulkan] Hook up a shadow render job step It doesn't do much yet, but did help in getting light ids working.
2023-07-24 01:23:05 +00:00
uint16_t size;
uint16_t layer;
uint8_t numLayers;
uint8_t mode;
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
uint16_t light_id;
uint16_t matrix_base;// for rendering maps
uint16_t matrix_id; // for rendering shadows
} light_control_t;
[vulkan] Hook up the shadow map render pass There are some issues with the light renderers getting mangled, and only the first light is even touched (just begin and end of render pass), but this gets a lot of the framework into place.
2022-05-31 03:43:04 +00:00
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
typedef struct light_control_set_s
DARRAY_TYPE (light_control_t) light_control_set_t;
[vulkan] Hook up a shadow render job step It doesn't do much yet, but did help in getting light ids working.
2023-07-24 01:23:05 +00:00
[vulkan] Hook up the shadow map render pass There are some issues with the light renderers getting mangled, and only the first light is even touched (just begin and end of render pass), but this gets a lot of the framework into place.
2022-05-31 03:43:04 +00:00
[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
typedef struct lightingctx_s {
lightingframeset_t frames;
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
VkSampler sampler;
[vulkan] Use the resource functions for shadow maps Another step towards moving all resource creation into the one place. The motivation for doing the change was getting my test scene to work with only ambient lights or no lights at all.
2022-10-27 02:02:45 +00:00
struct qfv_resource_s *shadow_resources;
[vulkan] Rework lighting to use splats It's currently slower, and the cone splats are buggy, but the lighting code itself got some nice cleanups.
2023-06-27 16:01:56 +00:00
struct qfv_resource_s *light_resources;
[vulkan] Hook up the shadow map render pass There are some issues with the light renderers getting mangled, and only the first light is even touched (just begin and end of render pass), but this gets a lot of the framework into place.
2022-05-31 03:43:04 +00:00
qfv_lightmatset_t light_mats;
qfv_imageset_t light_images;
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
qfv_imageviewset_t light_views;
[vulkan] Rework lighting to use splats It's currently slower, and the cone splats are buggy, but the lighting code itself got some nice cleanups.
2023-06-27 16:01:56 +00:00
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
light_control_set_t light_control;
[vulkan] Hook up the shadow map render pass There are some issues with the light renderers getting mangled, and only the first light is even touched (just begin and end of render pass), but this gets a lot of the framework into place.
2022-05-31 03:43:04 +00:00
[vulkan] Hook up a shadow render job step It doesn't do much yet, but did help in getting light ids working.
2023-07-24 01:23:05 +00:00
qfv_attachmentinfo_t shadow_info;
[vulkan] Hook up the shadow map render pass There are some issues with the light renderers getting mangled, and only the first light is even touched (just begin and end of render pass), but this gets a lot of the framework into place.
2022-05-31 03:43:04 +00:00
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
VkSampler shadow_sampler;
VkDescriptorSet shadow_set;
[vulkan] Rework lighting to use splats It's currently slower, and the cone splats are buggy, but the lighting code itself got some nice cleanups.
2023-06-27 16:01:56 +00:00
VkBuffer splat_verts;
VkBuffer splat_inds;
[vulkan] Hook up all the shadow resources This gets everything but the actual shadow map bindings working: the validation layers don't like my type punning (which may well be the right thing) and specialization constants don't help (yet, anyway) but I want to get things into git.
2023-08-01 14:34:08 +00:00
uint32_t dynamic_base;
uint32_t dynamic_matrix_base;
uint32_t dynamic_count;
[vulkan] Move non-specific lighting code out of Vulkan The parsing of light data from maps is now in the client library, and basic light management is in scene. Putting the light loading code into the Vulkan renderer was a mistake I've wanted to correct for a while. The client code still needs a bit of cleanup, but the basics are working nicely.
2022-05-05 05:58:47 +00:00
struct lightingdata_s *ldata;
struct scene_s *scene;
[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
} lightingctx_t;
struct vulkan_ctx_s;
void Vulkan_Lighting_Init (struct vulkan_ctx_s *ctx);
[vulkan] Use the descriptor set manager This cleans up a lot of ugly code that I always thought was rather dumb.
2023-06-24 12:42:46 +00:00
void Vulkan_Lighting_Setup (struct vulkan_ctx_s *ctx);
[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
void Vulkan_Lighting_Shutdown (struct vulkan_ctx_s *ctx);
[vulkan] Move non-specific lighting code out of Vulkan The parsing of light data from maps is now in the client library, and basic light management is in scene. Putting the light loading code into the Vulkan renderer was a mistake I've wanted to correct for a while. The client code still needs a bit of cleanup, but the basics are working nicely.
2022-05-05 05:58:47 +00:00
void Vulkan_LoadLights (struct scene_s *scene, struct vulkan_ctx_s *ctx);
[vulkan] Use the shadow matrices when rendering maps It turns out bsp faces are still back-face culled despite the null point being on the front of every possible plane... or really, because it's on the front of every possible plane: sometimes the back face is the front face, and this breaks the face selection code (a separate traversal function will be needed for non-culling rendering). Despite that, other than having to deal with different pipelines, getting the model renderers working went better than expected.
2023-07-30 02:52:13 +00:00
VkDescriptorSet Vulkan_Lighting_Descriptors (struct vulkan_ctx_s *ctx,
int frame) __attribute__((pure));
[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
#endif//__QF_Vulkan_qf_lighting_h
Reference in a new issue Copy permalink