Fix GPU PageFault

Author: Cheaterdev

sources/DirectXFramework/DX12/CommandList.cpp

@@ -1308,6 +1308,7 @@ namespace DX12
 
 		tracked_resources.clear();
 		tracked_psos.clear();
+		tracked_heaps.clear();
 		TrackedResource::allow_resource_delete = false;
 
 		transition_list = nullptr;

sources/DirectXFramework/DX12/CommandList.h

@@ -298,8 +298,11 @@ namespace DX12
 		void reset();
 
 		std::list<ComPtr<ID3D12PipelineState>> tracked_psos;
-
+		
 	public:
+
+		std::list<ComPtr<ID3D12Heap>> tracked_heaps;
+
 	//	UINT64 wait_for = -1;
 		void flush_transitions();
 

sources/DirectXFramework/DX12/Queue.cpp

@@ -246,6 +246,9 @@ namespace DX12
 				}
 				else
 				{
+
+					// Need to request other queue to make a proper transition.
+					// It's OK, but better to avoid this
 					auto queue = Device::get().get_queue(transition_list->get_type());
 
 					{

sources/RenderSystem/Assets/TiledTexture.cpp

@@ -571,23 +571,17 @@ void TiledTexture::update(Render::CommandList::ptr& list)
             load_tilings();
         });
     });
-//    list->transition(visibility_texture.get(),  Render::ResourceState::COPY_DEST);
     list->get_copy().update_buffer(visibility_texture.get(), 0, reinterpret_cast<char*>(clear_data.data()), UINT(clear_data.size() * 4));
- //   list->transition(visibility_texture.get(),  Render::ResourceState::COMMON);
 
     if (residency_changed)
     {
         memcpy(residency_data_uploaded->array[0]->mips[0]->data.data(), residency_data->array[0]->mips[0]->data.data(), residency_data->array[0]->mips[0]->data.size());
-//        list->transition(residency_texture.get(),  Render::ResourceState::COPY_DEST);
         list->get_copy().update_texture(residency_texture, ivec3(0, 0, 0), ivec3(mips[0].tiles), 0, reinterpret_cast<const char*>(residency_data->array[0]->mips[0]->data.data()), residency_data->array[0]->mips[0]->width_stride);
- //       list->transition(residency_texture.get(),  Render::ResourceState::PIXEL_SHADER_RESOURCE);
         residency_changed = false;
     }
 
     if (upload_tiles.size())
     {
-   //     list->transition(tiled_tex.get(), Render::ResourceState::COPY_DEST);
-
         for (auto& t : upload_tiles)
         {
             ivec3 gpu_size = one_tile_size;
@@ -596,8 +590,7 @@ void TiledTexture::update(Render::CommandList::ptr& list)
             t->data.clear();
         }
 
- //       list->transition(tiled_tex.get(),Render::ResourceState::PIXEL_SHADER_RESOURCE);
-        upload_tiles.clear();
+       upload_tiles.clear();
     }
 }
 

sources/RenderSystem/Assets/TiledTexture.h

@@ -187,6 +187,12 @@ class TileHeapManager
 				&rangeTileCounts[0],
 				D3D12_TILE_MAPPING_FLAG_NONE
 			);*/
+
+
+			for (auto& p : pages)
+			{
+				list.tracked_heaps.push_back(p.get_native());
+			}
 			pages.clear();
 
 

sources/RenderSystem/Effects/VoxelGI/VoxelGIGraph.cpp

@@ -137,7 +137,7 @@ VoxelGI::VoxelGI(Scene::ptr& scene) :scene(scene)
 		tiled_volume_albedo_static.reset(new Texture3DTiledDynamic(desc));
 		tiled_volume_normal_static.reset(new Texture3DTiledDynamic(desc));
 
-		desc.MipLevels = 9;
+		desc.MipLevels = 6;
 		desc.Format = DXGI_FORMAT_R16G16B16A16_FLOAT;
 		tiled_volume_lighted.reset(new Texture3DTiledDynamic(desc));
 

sources/RenderSystem/TiledTextures/VisibilityBuffer.cpp

@@ -23,67 +23,16 @@ void VisibilityBuffer::wait_for_results()
 
 void VisibilityBuffer::update(CommandList::ptr& list)
 {
-
-	list->transition_uav(buffer.get());
-	/*list->read_buffer(buffer.get(), 0, buffer->get_size(), [this](const char* data, UINT64 size)
-	{
-		std::vector<task<bool>> tasks;
-
-
-		std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-	//	const int* i_data = reinterpret_cast<const int*>(data);
-		size /= sizeof(int);
-
-		int thread_count = std::min(sizes.y, 8);
-		int one_thread = size / thread_count;
-		//memcpy(resolved_data.data(), data, size);
-		//   auto int_data = reinterpret_cast<const unsigned int*>(data);
-		std::atomic_int counter = 0;
-		// if (Application::get().is_alive())
-		for (int thread = 0; thread < thread_count; thread++)
-			tasks.emplace_back(create_task([this, thread, one_thread, data,&counter]()
-		{
-
-
-			for (int i = one_thread*thread; i < one_thread*thread + one_thread; i++)
-			{
-
-
-				int x = i % sizes.x;
-				int z = i / (sizes.y*sizes.x);
-				int y = ((i - x) / sizes.x) % sizes.y;
-				if (data[4*i] == 0)
-					++counter;
-				process_tile_readback({ x,y,z }, data[4 * i]);
-
-			}
-			return true;
-		}));
-
-			for (auto &t : tasks)
-			t.wait();
-
-	Log::get() << "counter " << counter.load() << Log::endl;
-
-	});*/
-
+//TODO: GPU!!
 	waiter = list->get_copy().read_buffer(buffer.get(), 0, buffer->get_size(), [this](const char* data, UINT64 size)
 	{
-
-
-		std::vector<task<std::vector<ivec3>>> tasks;
-
-	
+		std::vector<task<std::vector<ivec3>>> tasks;	
 		std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-		//	const int* i_data = reinterpret_cast<const int*>(data);
 		size /= sizeof(int);
 
 		int thread_count = std::min(sizes.y, 8);
 		UINT one_thread = UINT(size / thread_count);
-		//memcpy(resolved_data.data(), data, size);
-		//   auto int_data = reinterpret_cast<const unsigned int*>(data);
-		
-		// if (Application::get().is_alive())
+
 		for (int thread = 0; thread < thread_count; thread++)
 			tasks.emplace_back(create_task([this, thread, one_thread, data]()
 		{
@@ -104,6 +53,7 @@ void VisibilityBuffer::update(CommandList::ptr& list)
 			}
 			return poses;
 		}));
+
 		int counter = 0;
 		for (auto &t : tasks)
 		{
@@ -118,15 +68,7 @@ void VisibilityBuffer::update(CommandList::ptr& list)
 
 	});
 
-
-//	list->transition_uav(buffer.get());
-//	list->transition(buffer.get(), Render::ResourceState::COPY_DEST);
 	list->get_copy().update_buffer(buffer.get(), 0, reinterpret_cast<char*>(clear_data.data()), (UINT)clear_data.size());
-//	list->clear_
-//	list->transition(buffer.get(), Render::ResourceState::UNORDERED_ACCESS);
-//	list->transition_uav(buffer.get());
-
-	
 }
 
 void VisibilityBufferUniversal::process_tile_readback(ivec3 pos, char level)