From 817d02532839b0d6e45747380a10865e6f05ff0f Mon Sep 17 00:00:00 2001 From: Rodolfo Bogado Date: Fri, 5 Dec 2014 23:54:34 -0300 Subject: [PATCH] small spacing fixes --- Source/Core/VideoBackends/D3D/BoundingBox.cpp | 8 ++++---- Source/Core/VideoBackends/D3D/main.cpp | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.cpp b/Source/Core/VideoBackends/D3D/BoundingBox.cpp index 0bb55acab9..37f2ca8890 100644 --- a/Source/Core/VideoBackends/D3D/BoundingBox.cpp +++ b/Source/Core/VideoBackends/D3D/BoundingBox.cpp @@ -23,7 +23,7 @@ void BBox::Init() if (g_ActiveConfig.backend_info.bSupportsBBox) { // Create 2 buffers here. - // First ror unordered access on Default pool. + // First for unordered access on default pool. auto desc = CD3D11_BUFFER_DESC(4 * sizeof(s32), D3D11_BIND_UNORDERED_ACCESS, D3D11_USAGE_DEFAULT, 0, 0, 4); int initial_values[4] = { 0, 0, 0, 0 }; D3D11_SUBRESOURCE_DATA data; @@ -33,7 +33,7 @@ void BBox::Init() HRESULT hr; hr = D3D::device->CreateBuffer(&desc, &data, &s_bbox_buffer); CHECK(SUCCEEDED(hr), "Create BoundingBox Buffer."); - D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_buffer, "BoundingBox Buffer"); + D3D::SetDebugObjectName(s_bbox_buffer, "BoundingBox Buffer"); // Second to use as a staging buffer. desc.Usage = D3D11_USAGE_STAGING; @@ -41,7 +41,7 @@ void BBox::Init() desc.BindFlags = 0; hr = D3D::device->CreateBuffer(&desc, nullptr, &s_bbox_staging_buffer); CHECK(SUCCEEDED(hr), "Create BoundingBox Staging Buffer."); - D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_staging_buffer, "BoundingBox Staging Buffer"); + D3D::SetDebugObjectName(s_bbox_staging_buffer, "BoundingBox Staging Buffer"); // UAV is required to allow concurrent access. D3D11_UNORDERED_ACCESS_VIEW_DESC UAVdesc = {}; @@ -52,7 +52,7 @@ void BBox::Init() UAVdesc.Buffer.NumElements = 4; hr = D3D::device->CreateUnorderedAccessView(s_bbox_buffer, &UAVdesc, &s_bbox_uav); CHECK(SUCCEEDED(hr), "Create BoundingBox UAV."); - D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_uav, "BoundingBox UAV"); + D3D::SetDebugObjectName(s_bbox_uav, "BoundingBox UAV"); } } diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 126afe015a..34a11d493f 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -77,7 +77,7 @@ void InitBackendInfo() g_Config.backend_info.bSupportsExclusiveFullscreen = true; g_Config.backend_info.bSupportsDualSourceBlend = true; g_Config.backend_info.bSupportsPrimitiveRestart = true; - g_Config.backend_info.bSupportsOversizedViewports = false; + g_Config.backend_info.bSupportsOversizedViewports = false; g_Config.backend_info.bSupportsStereoscopy = false; // TODO: not implemented IDXGIFactory* factory; @@ -112,19 +112,15 @@ void InitBackendInfo() g_Config.backend_info.AAModes.push_back(samples); } - - bool shader_model_5_supported = (DX11::D3D::GetFeatureLevel(ad) >= D3D_FEATURE_LEVEL_11_0); // Requires the earlydepthstencil attribute (only available in shader model 5) g_Config.backend_info.bSupportsEarlyZ = shader_model_5_supported; // Requires full UAV functionality (only available in shader model 5) g_Config.backend_info.bSupportsBBox = shader_model_5_supported; } - g_Config.backend_info.Adapters.push_back(UTF16ToUTF8(desc.Description)); ad->Release(); } - factory->Release(); // Clear ppshaders string vector