Merge pull request #651 from w23/stream-E331

E331: make water emissive again

- [x] Make acid water surfaces emissive again.
- [x] Update emissive color for them, fix #56

ref/vk/TODO.md

@@ -1,3 +1,10 @@
+# 2023-11-16 E331
+- [x] Emissive waters
+    - [x] add emissive water surface to polygon lights
+    - [x] update emissive color for water surfaces
+- [ ] dynamic UVs
+- [ ] discuss integration test strategies
+
 # 2023-11-14 E330
 - [x] culling worldmodel waters
      - [-] try simple flag culling (probably won't work)
@@ -8,7 +15,6 @@
     - [x] water -- doesn't seem to have 2nd face
         - [x] glpoly_t winding order is reversed when camera origin is opposite to (SURF_PLANEBACK-aware) surface normal
 - [x] discuss culling transparent surfaces strategies
-- [ ] discuss integration test strategies
 
 # 2023-11-13 E329
 - [-] culling -> need to cull everything except opaque and blend. Alpha-mask is culled.

ref/vk/vk_brush.c

@@ -1242,7 +1242,6 @@ static qboolean fillBrushSurfaces(fill_geometries_args_t args) {
 	const xvk_mapent_func_any_t *const entity_patch = getModelFuncAnyPatch(args.mod);
 	connectVertices(args.mod, entity_patch ? entity_patch->smooth_entire_model : false);
 
-
 	// Load sorted by gl_texturenum
 	// TODO this does not make that much sense in vulkan (can sort later)
 	for (int t = 0; t <= args.sizes.max_texture_id; ++t) {
@@ -1457,6 +1456,8 @@ static qboolean createRenderModel( const model_t *mod, vk_brush_model_t *bmodel,
 
 	vk_render_geometry_t *const geometries = Mem_Malloc(vk_core.pool, sizeof(vk_render_geometry_t) * sizes.num_surfaces);
 	bmodel->surface_to_geometry_index = Mem_Malloc(vk_core.pool, sizeof(int) * mod->nummodelsurfaces);
+	for (int i = 0; i < mod->nummodelsurfaces; ++i)
+		bmodel->surface_to_geometry_index[i] = -1;
 	bmodel->animated_indexes = Mem_Malloc(vk_core.pool, sizeof(int) * sizes.animated_count);
 	bmodel->animated_indexes_count = sizes.animated_count;
 
@@ -1654,6 +1655,8 @@ void R_VkBrushModelCollectEmissiveSurfaces( const struct model_s *mod, qboolean
 		switch (getSurfaceType(surf, surface_index, is_worldmodel)) {
 		case BrushSurface_Regular:
 		case BrushSurface_Animated:
+		case BrushSurface_Water:
+		// No known cases, also needs to be dynamic case BrushSurface_WaterSide:
 			break;
 		default:
 			continue;
@@ -1687,6 +1690,7 @@ void R_VkBrushModelCollectEmissiveSurfaces( const struct model_s *mod, qboolean
 	}
 
 	// Clear old per-geometry emissive values. The new emissive values will be assigned by the loop below only to the relevant geoms
+	// This is relevant for updating lights during development
 	for (int i = 0; i < bmodel->render_model.num_geometries; ++i) {
 		vk_render_geometry_t *const geom = bmodel->render_model.geometries + i;
 		VectorClear(geom->emissive);
@@ -1701,6 +1705,7 @@ void R_VkBrushModelCollectEmissiveSurfaces( const struct model_s *mod, qboolean
 	}
 
 	// Apply all emissive surfaces found
+	int geom_indices_count = 0;
 	for (int i = 0; i < emissive_surfaces_count; ++i) {
 		const emissive_surface_t* const s = emissive_surfaces + i;
 
@@ -1726,9 +1731,16 @@ void R_VkBrushModelCollectEmissiveSurfaces( const struct model_s *mod, qboolean
 		}
 
 		// Assign the emissive value to the right geometry
-		const int geom_index = bmodel->surface_to_geometry_index[s->model_surface_index];
-		geom_indices[i] = geom_index;
-		VectorCopy(polylight.emissive, bmodel->render_model.geometries[geom_index].emissive);
+		if (bmodel->surface_to_geometry_index) { // Can be absent for water-only models
+			const int geom_index = bmodel->surface_to_geometry_index[s->model_surface_index];
+			if (geom_index != -1) { // can be missing for water surfaces
+				ASSERT(geom_index >= 0);
+				ASSERT(geom_index < bmodel->render_model.num_geometries);
+				ASSERT(geom_indices_count < COUNTOF(geom_indices));
+				geom_indices[geom_indices_count++] = geom_index;
+				VectorCopy(polylight.emissive, bmodel->render_model.geometries[geom_index].emissive);
+			}
+		}
 	}
 
 	if (emissive_surfaces_count > 0) {
@@ -1746,7 +1758,7 @@ void R_VkBrushModelCollectEmissiveSurfaces( const struct model_s *mod, qboolean
 			R_VkStagingFlushSync();
 		}
 
-		R_RenderModelUpdateMaterials(&bmodel->render_model, geom_indices, emissive_surfaces_count);
+		R_RenderModelUpdateMaterials(&bmodel->render_model, geom_indices, geom_indices_count);
 		INFO("Loaded %d polylights for %s model %s", emissive_surfaces_count, is_static ? "static" : "movable", mod->name);
 	}
 }

ref/vk/vk_ray_model.c

@@ -258,7 +258,20 @@ void RT_ModelDestroy(struct rt_model_s* model) {
 }
 
 qboolean RT_ModelUpdate(struct rt_model_s *model, const struct vk_render_geometry_s *geometries, int geometries_count) {
-	return RT_BlasBuild(model->blas, geometries, geometries_count);
+	// TODO: It might be beneficial to be able to supply which parts of the RT model should be updated.
+	// E.g.:
+	// - A flag to update BLAS (not all model updates need BLAS updates, e.g. waveHeight=0 water updates
+	// only update UVs)
+	// - A flag to update kusochki. Not all updates update offsets and textures, e.g. studio models have
+	// stable textures that don't change.
+
+	// Schedule rebuilding blas
+	if (!RT_BlasBuild(model->blas, geometries, geometries_count))
+		return false;
+
+	// Also update materials
+	RT_KusochkiUpload(model->kusochki.offset, geometries, geometries_count, NULL, NULL);
+	return true;
 }
 
 qboolean RT_ModelUpdateMaterials(struct rt_model_s *model, const struct vk_render_geometry_s *geometries, int geometries_count, const int *geom_indices, int geom_indices_count) {