Skip to content

Commit ede0239

Browse files
committed
Updates for Copper
1 parent 36e7637 commit ede0239

File tree

1 file changed

+31
-1
lines changed

1 file changed

+31
-1
lines changed

dxgi.cpp

+31-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ enum FLMASK : uint32_t
5252
#pragma warning(disable : 4063 4702)
5353
#endif
5454

55+
#if !defined(NTDDI_WIN10_CU)
56+
#define D3D_ROOT_SIGNATURE_VERSION_1_2 static_cast<D3D_ROOT_SIGNATURE_VERSION>(0x3)
57+
#pragma warning(disable : 4063 4702)
58+
#endif
59+
5560
//-----------------------------------------------------------------------------
5661
namespace
5762
{
@@ -319,7 +324,7 @@ namespace
319324
return D3D_ROOT_SIGNATURE_VERSION_1_0;
320325

321326
D3D12_FEATURE_DATA_ROOT_SIGNATURE rootSigOpt = {};
322-
rootSigOpt.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1;
327+
rootSigOpt.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_2;
323328
HRESULT hr = device->CheckFeatureSupport(D3D12_FEATURE_ROOT_SIGNATURE, &rootSigOpt, sizeof(rootSigOpt));
324329
while (hr == E_INVALIDARG && rootSigOpt.HighestVersion > D3D_ROOT_SIGNATURE_VERSION_1_0)
325330
{
@@ -4391,6 +4396,7 @@ namespace
43914396
{
43924397
case D3D_ROOT_SIGNATURE_VERSION_1_0: rootSig = "1.0"; break;
43934398
case D3D_ROOT_SIGNATURE_VERSION_1_1: rootSig = "1.1"; break;
4399+
case D3D_ROOT_SIGNATURE_VERSION_1_2: rootSig = "1.2"; break;
43944400
}
43954401

43964402
char heap[16];
@@ -4550,6 +4556,10 @@ namespace
45504556
LVYESNO("Dynamic IB strip-cut support", d3d12opts15.DynamicIndexBufferStripCutSupported);
45514557
LVYESNO("Dynamic depth bias support", d3d12opts16.DynamicDepthBiasSupported);
45524558
#endif
4559+
4560+
#if defined(NTDDI_WIN10_CU)
4561+
LVYESNO("GPU upload heap support", d3d12opts16.GPUUploadHeapSupported);
4562+
#endif
45534563
}
45544564
else
45554565
{
@@ -4608,6 +4618,10 @@ namespace
46084618
PRINTYESNO("Dynamic IB strip-cut support", d3d12opts15.DynamicIndexBufferStripCutSupported);
46094619
PRINTYESNO("Dynamic depth bias support", d3d12opts16.DynamicDepthBiasSupported);
46104620
#endif
4621+
4622+
#if defined(NTDDI_WIN10_CU)
4623+
PRINTYESNO("GPU upload heap support", d3d12opts16.GPUUploadHeapSupported);
4624+
#endif
46114625
}
46124626

46134627
return S_OK;
@@ -4835,6 +4849,12 @@ namespace
48354849
writeable_msaa_txt = d3d12opts14.WriteableMSAATexturesSupported ? c_szYes : c_szNo;
48364850
#endif
48374851

4852+
const char* nonNormalizedCoords = nullptr;
4853+
#if defined(NTDDI_WIN10_CU)
4854+
auto d3d12opts17 = GetD3D12Options<D3D12_FEATURE_D3D12_OPTIONS17, D3D12_FEATURE_DATA_D3D12_OPTIONS17>(pDevice);
4855+
nonNormalizedCoords = d3d12opts17.NonNormalizedCoordinateSamplersSupported ? c_szYes : c_szNo;
4856+
#endif
4857+
48384858
if (!pPrintInfo)
48394859
{
48404860
LVYESNO("Double-precision Shaders", d3d12opts.DoublePrecisionFloatShaderOps);
@@ -4914,6 +4934,11 @@ namespace
49144934
{
49154935
LVLINE("Writeable MSAA textures", writeable_msaa_txt);
49164936
}
4937+
4938+
if (nonNormalizedCoords)
4939+
{
4940+
LVLINE("Non-normalized sampler coordinates", nonNormalizedCoords);
4941+
}
49174942
}
49184943
else
49194944
{
@@ -4994,6 +5019,11 @@ namespace
49945019
{
49955020
PRINTLINE("Writeable MSAA textures", writeable_msaa_txt);
49965021
}
5022+
5023+
if (nonNormalizedCoords)
5024+
{
5025+
PRINTLINE("Non-normalized sampler coordinates", nonNormalizedCoords);
5026+
}
49975027
}
49985028

49995029
return S_OK;

0 commit comments

Comments
 (0)