diff --git a/Engine/gapi/directx12/dxallocator.cpp b/Engine/gapi/directx12/dxallocator.cpp index cd53d81c..1eb3db67 100644 --- a/Engine/gapi/directx12/dxallocator.cpp +++ b/Engine/gapi/directx12/dxallocator.cpp @@ -61,10 +61,7 @@ DxAllocator::Provider::DeviceMemory DxAllocator::Provider::alloc(size_t size, ui } ID3D12Heap* ret = nullptr; - std::cout << __func__ << " " << device <<" " << __LINE__ << std::endl; - std::cout << __func__ << " " << device->device.get() <<" " << __LINE__ << std::endl; HRESULT hr = device->device->CreateHeap(&heapDesc, ::uuid(), reinterpret_cast(&ret)); - std::cout << __func__ << " " << __LINE__ << std::endl; if(SUCCEEDED(hr)) return ret; return nullptr; diff --git a/Engine/gapi/directx12api.cpp b/Engine/gapi/directx12api.cpp index 1908cfaa..606a3c3b 100644 --- a/Engine/gapi/directx12api.cpp +++ b/Engine/gapi/directx12api.cpp @@ -19,7 +19,6 @@ #include "directx12/dxfbolayout.h" #include -#include using namespace Tempest; using namespace Tempest::Detail; @@ -55,6 +54,8 @@ struct DirectX12Api::Impl { adapter->GetDesc1(&desc); if(desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE) continue; + if(lstrcmpW(desc.Description,L"Microsoft Basic Render Driver")==0) + continue; ComPtr adapter3; adapter->QueryInterface(uuid(), reinterpret_cast(&adapter3.get())); @@ -85,6 +86,8 @@ struct DirectX12Api::Impl { adapter->GetDesc1(&desc); if(desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE) continue; + if(lstrcmpW(desc.Description,L"Microsoft Basic Render Driver")==0) + continue; AbstractGraphicsApi::Props props={}; DxDevice::getProp(desc,props); @@ -217,14 +220,10 @@ AbstractGraphicsApi::PBuffer DirectX12Api::createBuffer(AbstractGraphicsApi::Dev return buf; } - std::cout << __func__ << " " << __LINE__ << std::endl; DxBuffer base = dx.allocator.alloc(nullptr,count,size,alignedSz,usage,flg); - std::cout << __func__ << " " << __LINE__ << std::endl; Detail::DSharedPtr buf(new Detail::DxBuffer(std::move(base))); - std::cout << __func__ << " " << __LINE__ << std::endl; if(mem!=nullptr) buf.handler->update(mem,0,count,size,alignedSz); - std::cout << __func__ << " " << __LINE__ << std::endl; return buf; } diff --git a/Tests/tests/gapi/gapi_test_common.h b/Tests/tests/gapi/gapi_test_common.h index 34157fa1..8d91fbad 100644 --- a/Tests/tests/gapi/gapi_test_common.h +++ b/Tests/tests/gapi/gapi_test_common.h @@ -42,8 +42,6 @@ void Vbo() { try { GraphicsApi api{ApiFlags::Validation}; - for(auto& i:api.devices()) - std::cout << i.name << std::endl; Device device(api); auto vbo = device.vbo(vboData,3);