qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 05:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Handle spotlights pointing -X

Browse source 
The problem didn't show up until the switch to float depth buffers
(because they can store the resulting nan).
This commit is contained in:
Bill Currie 2023-12-19 17:56:13 +09:00
parent 2e9e247ca4
commit 0f24f10bb9
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/video/renderer/vulkan/shader/light_splat.vert
View file

@ -18,7 +18,7 @@ from_to_rotation (vec3 a, vec3 b)
{ {
float d = dot (a + b, a + b); float d = dot (a + b, a + b);
float qc = sqrt (d); float qc = sqrt (d);
vec3 qv = d > 1e-6 ? cross (a, b) / qc : vec3 (1, 0, 0); vec3 qv = d > 1e-6 ? cross (a, b) / qc : vec3 (0, 0, 1);
return vec4 (qv, qc * 0.5); return vec4 (qv, qc * 0.5);
} }

11
libs/video/renderer/vulkan/vulkan_lighting.c
View file

@ -845,6 +845,7 @@ lighting_update_lights (const exprval_t **params, exprval_t *result,
QFV_PacketScatterBuffer (packet, lframe->entid_buffer, 1, &eid_scatter, QFV_PacketScatterBuffer (packet, lframe->entid_buffer, 1, &eid_scatter,
ir_barrier); ir_barrier);
memset (lframe->id_radius, -1, MaxLights * sizeof (light_idrad_t));
for (int i = 0; i < ST_COUNT; i++) { for (int i = 0; i < ST_COUNT; i++) {
auto q = queue[i]; auto q = queue[i];
auto idr = &lframe->id_radius[q.start]; auto idr = &lframe->id_radius[q.start];
@ -2045,10 +2046,11 @@ create_light_matrices (lightingctx_t *lctx)
break; break;
case ST_CASCADE: case ST_CASCADE:
case ST_PLANE: case ST_PLANE:
//FIXME will fail for -ref_direction
dir = light->direction; dir = light->direction;
dir[3] = 0; dir[3] = 0;
mat4fquat (view, qrotf (dir, ref_direction)); vec4f_t q = dir[0] == -1 ? (vec4f_t) { 0, 0, 1, 0 }
: qrotf (dir, ref_direction);
mat4fquat (view, q);
break; break;
} }
vec4f_t pos = -light->position; vec4f_t pos = -light->position;
@ -2100,13 +2102,10 @@ upload_light_matrices (lightingctx_t *lctx, vulkan_ctx_t *ctx)
} }
QFV_PacketSubmit (packet); QFV_PacketSubmit (packet);
// FIXME temporary until batched shadow rendering is implemented
packet = QFV_PacketAcquire (ctx->staging); packet = QFV_PacketAcquire (ctx->staging);
size_t id_size = sizeof (uint32_t[MaxLights * 6]); size_t id_size = sizeof (uint32_t[MaxLights * 6]);
uint32_t *id_data = QFV_PacketExtend (packet, id_size); uint32_t *id_data = QFV_PacketExtend (packet, id_size);
for (int i = 0; i < MaxLights * 6; i++) { memset (id_data, -1, id_size);
id_data[i] = i;
}
for (size_t i = 0; i < lctx->frames.size; i++) { for (size_t i = 0; i < lctx->frames.size; i++) {
auto lframe = &lctx->frames.a[i]; auto lframe = &lctx->frames.a[i];
QFV_PacketCopyBuffer (packet, lframe->shadowmat_id_buffer, 0, bb); QFV_PacketCopyBuffer (packet, lframe->shadowmat_id_buffer, 0, bb);