quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DX12: index buffer alignment check. fixed invalid use of resources during restart.

Browse Source
This commit is contained in:
Artem Kharytoniuk 2017-12-24 18:52:49 +01:00
parent 0aa262a47f
commit 6552cd2a64
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/renderer/dx.cpp
View File

@ -402,10 +402,9 @@ void dx_initialize() {
DX_CHECK(dx.geometry_buffer->Map(0, &read_range, &p_data)); DX_CHECK(dx.geometry_buffer->Map(0, &read_range, &p_data));
dx.vertex_buffer_ptr = static_cast<byte*>(p_data); dx.vertex_buffer_ptr = static_cast<byte*>(p_data);
assert(((size_t)dx.vertex_buffer_ptr & 0xffff) == 0);
assert((VERTEX_BUFFER_SIZE & 0xffff) == 0); // index buffer offset should be 64K aligned.
dx.index_buffer_ptr = static_cast<byte*>(p_data) + VERTEX_BUFFER_SIZE; dx.index_buffer_ptr = static_cast<byte*>(p_data) + VERTEX_BUFFER_SIZE;
assert(((size_t)dx.index_buffer_ptr & 0xffff) == 0);
} }
// //
@ -613,6 +612,8 @@ void dx_shutdown() {
} }
void dx_release_resources() { void dx_release_resources() {
dx_wait_device_idle();
dx_world.pipeline_create_time = 0.0f; dx_world.pipeline_create_time = 0.0f;
for (int i = 0; i < dx_world.num_pipeline_states; i++) { for (int i = 0; i < dx_world.num_pipeline_states; i++) {
dx_world.pipeline_states[i]->Release(); dx_world.pipeline_states[i]->Release();

2
src/engine/renderer/tr_init.c
View File

@ -31,7 +31,7 @@ glstate_t glState;
Vk_Instance vk; Vk_Instance vk;
Vk_World vk_world; Vk_World vk_world;
// D3D // DX12
Dx_Instance dx; Dx_Instance dx;
Dx_World dx_world; Dx_World dx_world;