Skip to content

Commit 83bd7fa

Browse files
walbournwalbourn
committed
Assume WIC2 types always available
1 parent 20ead3e commit 83bd7fa

7 files changed

+0
-81
lines changed

‎DirectXTex/DirectXTexMipmaps.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -457,16 +457,12 @@ HRESULT DirectX::Internal::ResizeSeparateColorAndAlpha(
457457
}
458458
else
459459
{
460-
#if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
461460
if (iswic2)
462461
{
463462
colorBytesInPixel = colorBytesPerPixel = 12;
464463
colorPixelFormat = GUID_WICPixelFormat96bppRGBFloat;
465464
}
466465
else
467-
#else
468-
UNREFERENCED_PARAMETER(iswic2);
469-
#endif
470466
{
471467
colorBytesInPixel = 12;
472468
colorBytesPerPixel = 16;

‎DirectXTex/DirectXTexUtil.cpp

-17
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ namespace
8484

8585
BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID *ifactory) noexcept
8686
{
87-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
8887
HRESULT hr = CoCreateInstance(
8988
CLSID_WICImagingFactory2,
9089
nullptr,
@@ -112,16 +111,6 @@ namespace
112111
);
113112
return SUCCEEDED(hr) ? TRUE : FALSE;
114113
}
115-
#else
116-
g_WIC2 = false;
117-
118-
return SUCCEEDED(CoCreateInstance(
119-
CLSID_WICImagingFactory,
120-
nullptr,
121-
CLSCTX_INPROC_SERVER,
122-
__uuidof(IWICImagingFactory),
123-
ifactory)) ? TRUE : FALSE;
124-
#endif
125114
}
126115

127116
#else // !WIN32
@@ -150,13 +139,11 @@ DXGI_FORMAT DirectX::Internal::WICToDXGI(const GUID& guid) noexcept
150139
return g_WICFormats[i].format;
151140
}
152141

153-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
154142
if (g_WIC2)
155143
{
156144
if (memcmp(&GUID_WICPixelFormat96bppRGBFloat, &guid, sizeof(GUID)) == 0)
157145
return DXGI_FORMAT_R32G32B32_FLOAT;
158146
}
159-
#endif
160147

161148
return DXGI_FORMAT_UNKNOWN;
162149
}
@@ -196,15 +183,13 @@ bool DirectX::Internal::DXGIToWIC(DXGI_FORMAT format, GUID& guid, bool ignoreRGB
196183
memcpy(&guid, &GUID_WICPixelFormat32bppBGR, sizeof(GUID));
197184
return true;
198185

199-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
200186
case DXGI_FORMAT_R32G32B32_FLOAT:
201187
if (g_WIC2)
202188
{
203189
memcpy(&guid, &GUID_WICPixelFormat96bppRGBFloat, sizeof(GUID));
204190
return true;
205191
}
206192
break;
207-
#endif
208193

209194
default:
210195
for (size_t i = 0; i < std::size(g_WICFormats); ++i)
@@ -328,14 +313,12 @@ void DirectX::SetWICFactory(_In_opt_ IWICImagingFactory* pWIC) noexcept
328313
bool iswic2 = false;
329314
if (pWIC)
330315
{
331-
#if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
332316
ComPtr<IWICImagingFactory2> wic2;
333317
HRESULT hr = pWIC->QueryInterface(IID_PPV_ARGS(wic2.GetAddressOf()));
334318
if (SUCCEEDED(hr))
335319
{
336320
iswic2 = true;
337321
}
338-
#endif
339322
pWIC->AddRef();
340323
}
341324

‎DirectXTex/DirectXTexWIC.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,9 @@ namespace
8181
{ GUID_WICPixelFormat40bppCMYKAlpha, GUID_WICPixelFormat32bppRGBA, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R8G8B8A8_UNORM
8282
{ GUID_WICPixelFormat80bppCMYKAlpha, GUID_WICPixelFormat64bppRGBA, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R16G16B16A16_UNORM
8383

84-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
8584
{ GUID_WICPixelFormat32bppRGB, GUID_WICPixelFormat32bppRGBA, TEX_ALPHA_MODE_OPAQUE }, // DXGI_FORMAT_R8G8B8A8_UNORM
8685
{ GUID_WICPixelFormat64bppRGB, GUID_WICPixelFormat64bppRGBA, TEX_ALPHA_MODE_OPAQUE }, // DXGI_FORMAT_R16G16B16A16_UNORM
8786
{ GUID_WICPixelFormat64bppPRGBAHalf, GUID_WICPixelFormat64bppRGBAHalf, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R16G16B16A16_FLOAT
88-
#endif
8987

9088
// We don't support n-channel formats
9189
};
@@ -111,17 +109,13 @@ namespace
111109
{
112110
if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
113111
{
114-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
115112
if (iswic2)
116113
{
117114
if (pConvert)
118115
memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat96bppRGBFloat, sizeof(GUID));
119116
format = DXGI_FORMAT_R32G32B32_FLOAT;
120117
}
121118
else
122-
#else
123-
UNREFERENCED_PARAMETER(iswic2);
124-
#endif
125119
{
126120
if (pConvert)
127121
memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));

‎ScreenGrab/ScreenGrab11.cpp

-11
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,6 @@ namespace
741741

742742
BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID* ifactory) noexcept
743743
{
744-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
745744
HRESULT hr = CoCreateInstance(
746745
CLSID_WICImagingFactory2,
747746
nullptr,
@@ -767,14 +766,6 @@ namespace
767766
);
768767
return SUCCEEDED(hr) ? TRUE : FALSE;
769768
}
770-
#else
771-
return SUCCEEDED(CoCreateInstance(
772-
CLSID_WICImagingFactory,
773-
nullptr,
774-
CLSCTX_INPROC_SERVER,
775-
__uuidof(IWICImagingFactory),
776-
ifactory)) ? TRUE : FALSE;
777-
#endif
778769
}
779770

780771
IWICImagingFactory* GetWIC() noexcept
@@ -1100,7 +1091,6 @@ HRESULT DirectX::SaveWICTextureToFile(
11001091
// Screenshots don't typically include the alpha channel of the render target
11011092
switch (desc.Format)
11021093
{
1103-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
11041094
case DXGI_FORMAT_R32G32B32A32_FLOAT:
11051095
case DXGI_FORMAT_R16G16B16A16_FLOAT:
11061096
if (g_WIC2)
@@ -1112,7 +1102,6 @@ HRESULT DirectX::SaveWICTextureToFile(
11121102
targetGuid = GUID_WICPixelFormat24bppBGR;
11131103
}
11141104
break;
1115-
#endif
11161105

11171106
case DXGI_FORMAT_R16G16B16A16_UNORM: targetGuid = GUID_WICPixelFormat48bppBGR; break;
11181107
case DXGI_FORMAT_B5G5R5A1_UNORM: targetGuid = GUID_WICPixelFormat16bppBGR555; break;

‎ScreenGrab/ScreenGrab9.cpp

-13
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ namespace
520520

521521
BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID* ifactory) noexcept
522522
{
523-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
524523
HRESULT hr = CoCreateInstance(
525524
CLSID_WICImagingFactory2,
526525
nullptr,
@@ -546,14 +545,6 @@ namespace
546545
);
547546
return SUCCEEDED(hr) ? TRUE : FALSE;
548547
}
549-
#else
550-
return SUCCEEDED(CoCreateInstance(
551-
CLSID_WICImagingFactory,
552-
nullptr,
553-
CLSCTX_INPROC_SERVER,
554-
__uuidof(IWICImagingFactory),
555-
ifactory)) ? TRUE : FALSE;
556-
#endif
557548
}
558549

559550
IWICImagingFactory* GetWIC()
@@ -800,14 +791,12 @@ HRESULT DirectX::SaveWICTextureToFile(
800791
case D3DFMT_R32F: pfGuid = GUID_WICPixelFormat32bppGrayFloat; break;
801792
case D3DFMT_A32B32G32R32F: pfGuid = GUID_WICPixelFormat128bppRGBAFloat; break;
802793

803-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
804794
case D3DFMT_X8B8G8R8:
805795
if (g_WIC2)
806796
pfGuid = GUID_WICPixelFormat32bppRGB;
807797
else
808798
HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
809799
break;
810-
#endif
811800

812801
default:
813802
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
@@ -879,7 +868,6 @@ HRESULT DirectX::SaveWICTextureToFile(
879868
// Screenshots don't typically include the alpha channel of the render target
880869
switch (desc.Format)
881870
{
882-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
883871
case D3DFMT_A32B32G32R32F:
884872
case D3DFMT_A16B16G16R16F:
885873
if (g_WIC2)
@@ -891,7 +879,6 @@ HRESULT DirectX::SaveWICTextureToFile(
891879
targetGuid = GUID_WICPixelFormat24bppBGR;
892880
}
893881
break;
894-
#endif
895882

896883
case D3DFMT_A16B16G16R16: targetGuid = GUID_WICPixelFormat48bppBGR; break;
897884
case D3DFMT_R5G6B5: targetGuid = GUID_WICPixelFormat16bppBGR565; break;

‎WICTextureLoader/WICTextureLoader11.cpp

-19
Original file line numberDiff line numberDiff line change
@@ -179,22 +179,17 @@ namespace
179179
{ GUID_WICPixelFormat40bppCMYKAlpha, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM
180180
{ GUID_WICPixelFormat80bppCMYKAlpha, GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
181181

182-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
183182
{ GUID_WICPixelFormat32bppRGB, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM
184183
{ GUID_WICPixelFormat64bppRGB, GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
185184
{ GUID_WICPixelFormat64bppPRGBAHalf, GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT
186-
#endif
187185

188186
// We don't support n-channel formats
189187
};
190188

191-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
192189
bool g_WIC2 = false;
193-
#endif
194190

195191
BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID *ifactory) noexcept
196192
{
197-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
198193
HRESULT hr = CoCreateInstance(
199194
CLSID_WICImagingFactory2,
200195
nullptr,
@@ -220,14 +215,6 @@ namespace
220215
);
221216
return SUCCEEDED(hr) ? TRUE : FALSE;
222217
}
223-
#else
224-
return SUCCEEDED(CoCreateInstance(
225-
CLSID_WICImagingFactory,
226-
nullptr,
227-
CLSCTX_INPROC_SERVER,
228-
__uuidof(IWICImagingFactory),
229-
ifactory)) ? TRUE : FALSE;
230-
#endif
231218
}
232219

233220
IWICImagingFactory* GetWIC() noexcept
@@ -256,13 +243,11 @@ namespace
256243
return g_WICFormats[i].format;
257244
}
258245

259-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
260246
if (g_WIC2)
261247
{
262248
if (memcmp(&GUID_WICPixelFormat96bppRGBFloat, &guid, sizeof(GUID)) == 0)
263249
return DXGI_FORMAT_R32G32B32_FLOAT;
264250
}
265-
#endif
266251

267252
return DXGI_FORMAT_UNKNOWN;
268253
}
@@ -468,15 +453,13 @@ namespace
468453
{
469454
if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
470455
{
471-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
472456
if (g_WIC2)
473457
{
474458
memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat96bppRGBFloat, sizeof(GUID));
475459
format = DXGI_FORMAT_R32G32B32_FLOAT;
476460
bpp = 96;
477461
}
478462
else
479-
#endif
480463
{
481464
memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));
482465
format = DXGI_FORMAT_R32G32B32A32_FLOAT;
@@ -507,7 +490,6 @@ namespace
507490
bpp = WICBitsPerPixel(pixelFormat);
508491
}
509492

510-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
511493
if ((format == DXGI_FORMAT_R32G32B32_FLOAT) && d3dContext && textureView)
512494
{
513495
// Special case test for optional device support for autogen mipchains for R32G32B32_FLOAT
@@ -521,7 +503,6 @@ namespace
521503
bpp = 128;
522504
}
523505
}
524-
#endif
525506

526507
if (loadFlags & WIC_LOADER_FORCE_RGBA32)
527508
{

‎WICTextureLoader/WICTextureLoader9.cpp

-11
Original file line numberDiff line numberDiff line change
@@ -156,20 +156,17 @@ namespace
156156
{ GUID_WICPixelFormat40bppCMYKAlpha, GUID_WICPixelFormat32bppBGRA }, // D3DFMT_A8R8G8B8
157157
{ GUID_WICPixelFormat80bppCMYKAlpha, GUID_WICPixelFormat64bppRGBA }, // D3DFMT_A16B16G16R16
158158

159-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
160159
{ GUID_WICPixelFormat32bppRGB, GUID_WICPixelFormat32bppBGRA }, // D3DFMT_A8R8G8B8
161160
{ GUID_WICPixelFormat64bppRGB, GUID_WICPixelFormat64bppRGBA }, // D3DFMT_A16B16G16R16
162161
{ GUID_WICPixelFormat64bppPRGBAHalf, GUID_WICPixelFormat64bppRGBAHalf }, // D3DFMT_A16B16G16R16F
163162
{ GUID_WICPixelFormat96bppRGBFloat, GUID_WICPixelFormat128bppRGBAFloat }, // D3DFMT_A32B32G32R32F
164-
#endif
165163

166164
// We don't support n-channel formats
167165
};
168166

169167
//--------------------------------------------------------------------------------------
170168
BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID* ifactory) noexcept
171169
{
172-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
173170
HRESULT hr = CoCreateInstance(
174171
CLSID_WICImagingFactory2,
175172
nullptr,
@@ -194,14 +191,6 @@ namespace
194191
);
195192
return SUCCEEDED(hr) ? TRUE : FALSE;
196193
}
197-
#else
198-
return SUCCEEDED(CoCreateInstance(
199-
CLSID_WICImagingFactory,
200-
nullptr,
201-
CLSCTX_INPROC_SERVER,
202-
__uuidof(IWICImagingFactory),
203-
ifactory)) ? TRUE : FALSE;
204-
#endif
205194
}
206195

207196
IWICImagingFactory* GetWIC() noexcept

0 commit comments

Comments
 (0)