Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-14 06:00:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed obsolete adapter code for VS 2010/2012

Browse Source
This commit is contained in:
Chuck Walbourn 2016-04-08 18:01:05 -07:00
parent 990b989be9
commit eca2005ac5
5 changed files with 6 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DDSTextureLoader/DDSTextureLoader.h
View File

@ -18,28 +18,11 @@
// http://go.microsoft.com/fwlink/?LinkId=248929 // http://go.microsoft.com/fwlink/?LinkId=248929
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
#ifdef _MSC_VER
#pragma once #pragma once
#endif
#include <d3d11_1.h> #include <d3d11_1.h>
#pragma warning(push)
#pragma warning(disable : 4005)
#include <stdint.h> #include <stdint.h>
#pragma warning(pop)
#if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_)
#define _In_reads_(exp)
#define _Out_writes_(exp)
#define _In_reads_bytes_(exp)
#define _In_reads_opt_(exp)
#define _Outptr_opt_
#endif
#ifndef _Use_decl_annotations_
#define _Use_decl_annotations_
#endif
namespace DirectX namespace DirectX
{ {

40
ScreenGrab/ScreenGrab.cpp
View File

@ -28,32 +28,13 @@
#include <dxgiformat.h> #include <dxgiformat.h>
#include <assert.h> #include <assert.h>
#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8)
// VS 2010's stdint.h conflicts with intsafe.h
#pragma warning(push)
#pragma warning(disable : 4005)
#include <wincodec.h> #include <wincodec.h>
#include <intsafe.h>
#pragma warning(pop)
#endif
#include <wrl\client.h> #include <wrl\client.h>
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
// VS 2010/2012 do not support =default =delete
#ifndef DIRECTX_CTOR_DEFAULT
#if defined(_MSC_VER) && (_MSC_VER < 1800)
#define DIRECTX_CTOR_DEFAULT {}
#define DIRECTX_CTOR_DELETE ;
#else
#define DIRECTX_CTOR_DEFAULT =default;
#define DIRECTX_CTOR_DELETE =delete;
#endif
#endif
#include "ScreenGrab.h" #include "ScreenGrab.h"
using Microsoft::WRL::ComPtr; using Microsoft::WRL::ComPtr;
@ -241,12 +222,10 @@ namespace
private: private:
HANDLE m_handle; HANDLE m_handle;
auto_delete_file(const auto_delete_file&) DIRECTX_CTOR_DELETE; auto_delete_file(const auto_delete_file&) = delete;
auto_delete_file& operator=(const auto_delete_file&) DIRECTX_CTOR_DELETE; auto_delete_file& operator=(const auto_delete_file&) = delete;
}; };
#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8)
class auto_delete_file_wic class auto_delete_file_wic
{ {
public: public:
@ -266,11 +245,9 @@ namespace
LPCWSTR m_filename; LPCWSTR m_filename;
ComPtr<IWICStream>& m_handle; ComPtr<IWICStream>& m_handle;
auto_delete_file_wic(const auto_delete_file_wic&) DIRECTX_CTOR_DELETE; auto_delete_file_wic(const auto_delete_file_wic&) = delete;
auto_delete_file_wic& operator=(const auto_delete_file_wic&) DIRECTX_CTOR_DELETE; auto_delete_file_wic& operator=(const auto_delete_file_wic&) = delete;
}; };
#endif
} }
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@ -720,8 +697,6 @@ static HRESULT CaptureTexture( _In_ ID3D11DeviceContext* pContext,
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8)
static bool g_WIC2 = false; static bool g_WIC2 = false;
static IWICImagingFactory* _GetWIC() static IWICImagingFactory* _GetWIC()
@ -731,7 +706,7 @@ static IWICImagingFactory* _GetWIC()
if ( s_Factory ) if ( s_Factory )
return s_Factory; return s_Factory;
#if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
HRESULT hr = CoCreateInstance( HRESULT hr = CoCreateInstance(
CLSID_WICImagingFactory2, CLSID_WICImagingFactory2,
nullptr, nullptr,
@ -779,7 +754,6 @@ static IWICImagingFactory* _GetWIC()
return s_Factory; return s_Factory;
} }
#endif
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@ -943,8 +917,6 @@ HRESULT DirectX::SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext,
} }
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8)
HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext, HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext,
_In_ ID3D11Resource* pSource, _In_ ID3D11Resource* pSource,
_In_ REFGUID guidContainerFormat, _In_ REFGUID guidContainerFormat,
@ -1230,5 +1202,3 @@ HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext,
return S_OK; return S_OK;
} }
#endif // !WINAPI_FAMILY || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8)

8
ScreenGrab/ScreenGrab.h
View File

@ -19,21 +19,15 @@
// http://go.microsoft.com/fwlink/?LinkId=248929 // http://go.microsoft.com/fwlink/?LinkId=248929
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
#ifdef _MSC_VER
#pragma once #pragma once
#endif
#include <d3d11_1.h> #include <d3d11_1.h>
#include <ocidl.h> #include <ocidl.h>
#pragma warning(push)
#pragma warning(disable : 4005)
#include <stdint.h> #include <stdint.h>
#pragma warning(pop)
#include <functional> #include <functional>
namespace DirectX namespace DirectX
{ {
HRESULT SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext, HRESULT SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext,

5
WICTextureLoader/WICTextureLoader.cpp
View File

@ -31,12 +31,7 @@
#include <dxgiformat.h> #include <dxgiformat.h>
#include <assert.h> #include <assert.h>
// VS 2010's stdint.h conflicts with intsafe.h
#pragma warning(push)
#pragma warning(disable : 4005)
#include <wincodec.h> #include <wincodec.h>
#include <intsafe.h>
#pragma warning(pop)
#include <wrl\client.h> #include <wrl\client.h>

19
WICTextureLoader/WICTextureLoader.h
View File

@ -25,30 +25,11 @@
// http://go.microsoft.com/fwlink/?LinkId=248929 // http://go.microsoft.com/fwlink/?LinkId=248929
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
#ifdef _MSC_VER
#pragma once #pragma once
#endif
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) && (_WIN32_WINNT <= _WIN32_WINNT_WIN8)
#error WIC is not supported on Windows Phone 8.0
#endif
#include <d3d11_1.h> #include <d3d11_1.h>
#pragma warning(push)
#pragma warning(disable : 4005)
#include <stdint.h> #include <stdint.h>
#pragma warning(pop)
#if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_)
#define _In_reads_(exp)
#define _Out_writes_(exp)
#define _In_reads_bytes_(exp)
#endif
#ifndef _Use_decl_annotations_
#define _Use_decl_annotations_
#endif
namespace DirectX namespace DirectX
{ {