Skip to content

Commit af675e3

Browse files
walbourn_cpwalbourn_cp
walbourn_cp
authored and
walbourn_cp
committed
DirectXTex: WinRT usage problematic, sticking with CS on HGLBOAL
1 parent a303eea commit af675e3

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

DirectXTex/DirectXTexWIC.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515

1616
#include "directxtexp.h"
1717

18-
#ifdef __cplusplus_winrt
19-
#include <shcore.h>
20-
#pragma comment(lib,"shcore.lib")
21-
#endif
22-
2318
//-------------------------------------------------------------------------------------
2419
// WIC Pixel Format nearest conversion table
2520
//-------------------------------------------------------------------------------------
@@ -923,12 +918,7 @@ HRESULT SaveToWICMemory( const Image& image, DWORD flags, REFGUID containerForma
923918
blob.Release();
924919

925920
ScopedObject<IStream> stream;
926-
#ifdef __cplusplus_winrt
927-
auto randomAccessStream = ref new Windows::Storage::Streams::InMemoryRandomAccessStream();
928-
HRESULT hr = CreateStreamOverRandomAccessStream( randomAccessStream, __uuidof(IStream), reinterpret_cast<void **>( &stream ) );
929-
#else
930921
HRESULT hr = CreateStreamOnHGlobal( 0, TRUE, &stream );
931-
#endif
932922
if ( FAILED(hr) )
933923
return hr;
934924

@@ -975,12 +965,7 @@ HRESULT SaveToWICMemory( const Image* images, size_t nimages, DWORD flags, REFGU
975965
blob.Release();
976966

977967
ScopedObject<IStream> stream;
978-
#ifdef __cplusplus_winrt
979-
auto randomAccessStream = ref new Windows::Storage::Streams::InMemoryRandomAccessStream();
980-
HRESULT hr = CreateStreamOverRandomAccessStream( randomAccessStream, __uuidof(IStream), reinterpret_cast<void **>( &stream ) );
981-
#else
982968
HRESULT hr = CreateStreamOnHGlobal( 0, TRUE, &stream );
983-
#endif
984969
if ( FAILED(hr) )
985970
return hr;
986971

0 commit comments

Comments
 (0)