geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed line endings

main
Sam Lantinga 2014-03-10 14:35:37 -07:00
parent 3df586cef5
commit 7e8b25534d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/render/direct3d11/SDL_render_d3d11.c
View File

@ -1057,7 +1057,7 @@ D3D11_CreateBlendMode(SDL_Renderer * renderer,
/* Create resources that depend on the device. */ /* Create resources that depend on the device. */
static HRESULT static HRESULT
D3D11_CreateDeviceResources(SDL_Renderer * renderer) D3D11_CreateDeviceResources(SDL_Renderer * renderer)
{ {
typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory); typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory);
PFN_CREATE_DXGI_FACTORY CreateDXGIFactoryFunc; PFN_CREATE_DXGI_FACTORY CreateDXGIFactoryFunc;
D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata; D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
@ -1071,14 +1071,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
#ifdef __WINRT__ #ifdef __WINRT__
CreateDXGIFactoryFunc = CreateDXGIFactory; CreateDXGIFactoryFunc = CreateDXGIFactory;
D3D11CreateDeviceFunc = D3D11CreateDevice; D3D11CreateDeviceFunc = D3D11CreateDevice;
#else #else
data->hDXGIMod = SDL_LoadObject("dxgi.dll"); data->hDXGIMod = SDL_LoadObject("dxgi.dll");
if (!data->hDXGIMod) { if (!data->hDXGIMod) {
result = E_FAIL; result = E_FAIL;
goto done; goto done;
} }
CreateDXGIFactoryFunc = (PFN_CREATE_DXGI_FACTORY)SDL_LoadFunction(data->hDXGIMod, "CreateDXGIFactory"); CreateDXGIFactoryFunc = (PFN_CREATE_DXGI_FACTORY)SDL_LoadFunction(data->hDXGIMod, "CreateDXGIFactory");
if (!CreateDXGIFactoryFunc) { if (!CreateDXGIFactoryFunc) {
result = E_FAIL; result = E_FAIL;
goto done; goto done;
@ -1095,16 +1095,16 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
result = E_FAIL; result = E_FAIL;
goto done; goto done;
} }
#endif /* __WINRT__ */ #endif /* __WINRT__ */
result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory); result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory);
if (FAILED(result)) { if (FAILED(result)) {
WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result); WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result);
goto done; goto done;
} }
/* FIXME: Should we use the default adapter? */ /* FIXME: Should we use the default adapter? */
result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter); result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter);
if (FAILED(result)) { if (FAILED(result)) {
WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result);
goto done; goto done;