Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from w23/brush-concat-drawcalls 

concat brush drawcalls
This commit is contained in:
Ivan Avdeev 2021-08-15 12:08:06 -07:00 committed by GitHub
parent 584ca32d36 ee8e9d8ff7
commit e71a9de057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ref_vk/TODO.md
View File

@ -1,5 +1,6 @@
## 2021-08-15, E126
- [x] restore render debug labels
- [x] restore draw call concatenation; brush geoms are generated in a way that makes concatenating them impossible
# Next
- [ ] rtx: split ray tracing into modules: pipeline mgmt, buffer mgmt
@ -12,9 +13,9 @@
uint8_t data[];
# Planned
- [ ] filter things to render, e.g.: some sprites are there to fake bloom, we don't need to draw them in rtx mode
- [ ] make a list of all possible materials, categorize them and figure out what to do
- [ ] possibly split vk_render into (a) rendering/pipeline, (b) buffer management/allocation, (c) render state
- [ ] restore draw call concatenation; brush geoms are generated in a way that makes concatenating them impossible
- [ ] rtx: light styles: need static lights data, not clear how and what to do
- [ ] studio models: fix lighting: should have white texture instead of lightmap OR we could write nearest surface lightmap coords to fake light
- [ ] make it look correct lol

10
ref_vk/vk_brush.c
View File

@ -474,9 +474,9 @@ static qboolean loadBrushSurfaces( model_sizes_t sizes, const model_t *mod ) {
}
model_geometry->surf = surf;
model_geometry->texture = t;
model_geometry->texture = surf->texinfo->texture->gl_texturenum;
model_geometry->vertex_offset = vertex_buffer.buffer.unit.offset + vertex_offset;
model_geometry->vertex_offset = vertex_buffer.buffer.unit.offset;
model_geometry->vertex_count = surf->numedges;
model_geometry->index_offset = index_offset;
@ -530,9 +530,9 @@ static qboolean loadBrushSurfaces( model_sizes_t sizes, const model_t *mod ) {
// Ray tracing apparently expects triangle list only (although spec is not very clear about this kekw)
if (k > 1) {
*(bind++) = (uint16_t)(0);
*(bind++) = (uint16_t)(k - 1);
*(bind++) = (uint16_t)(k);
*(bind++) = (uint16_t)(vertex_offset + 0);
*(bind++) = (uint16_t)(vertex_offset + k - 1);
*(bind++) = (uint16_t)(vertex_offset + k);
index_count += 3;
index_offset += 3;
}