We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch fixing both errors

patch0 (text/plain), 21.42 KB, created by Rainer Deyke on 2016-07-27 14:15:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Deyke

Created: 2016-07-27 14:15:19 UTC

Size: 21.42 KB

patch

obsolete

>diff -r afd286e26823 src/core/windows/SDL_windows.c
>--- a/src/core/windows/SDL_windows.c	Wed Jul 20 21:01:14 2016 +0200
>+++ b/src/core/windows/SDL_windows.c	Wed Jul 27 15:56:14 2016 +0200
>@@ -33,16 +33,26 @@
> #endif
> 
> 
>-/* Sets an error message based on GetLastError() */
>+/* Sets an error message based on hr */
> int
> WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr)
> {
>+    return WIN_SetErrorfromHRESULT(prefix, "", hr);
>+}
>+
>+int
>+WIN_SetErrorFromHRESULT2(const char *prefix1, const char *prefix2, HRESULT hr)
>+{
>     TCHAR buffer[1024];
>     char *message;
>     FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, hr, 0,
>                   buffer, SDL_arraysize(buffer), NULL);
>     message = WIN_StringToUTF8(buffer);
>-    SDL_SetError("%s%s%s", prefix ? prefix : "", prefix ? ": " : "", message);
>+    if (prefix1 || prefix2) {
>+        SDL_SetError("%s%s: %s", prefix1 ? prefix1 : "", prefix2 ? prefix2 : "", message);
>+    } else {
>+        SDL_SetError("%s", message);
>+    }
>     SDL_free(message);
>     return -1;
> }
>diff -r afd286e26823 src/core/windows/SDL_windows.h
>--- a/src/core/windows/SDL_windows.h	Wed Jul 20 21:01:14 2016 +0200
>+++ b/src/core/windows/SDL_windows.h	Wed Jul 27 15:56:14 2016 +0200
>@@ -48,6 +48,7 @@
> 
> /* Sets an error message based on a given HRESULT */
> extern int WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr);
>+extern int WIN_SetErrorFromHRESULT2(const char *prefix1, const char *prefix2, HRESULT hr);
> 
> /* Sets an error message based on GetLastError(). Always return -1. */
> extern int WIN_SetError(const char *prefix);
>diff -r afd286e26823 src/render/direct3d11/SDL_render_d3d11.c
>--- a/src/render/direct3d11/SDL_render_d3d11.c	Wed Jul 20 21:01:14 2016 +0200
>+++ b/src/render/direct3d11/SDL_render_d3d11.c	Wed Jul 27 15:56:14 2016 +0200
>@@ -137,13 +137,13 @@
> 
> 
> /* Defined here so we don't have to include uuid.lib */
>-static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } };
>-static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } };
>-static const GUID IID_IDXGIDevice3 = { 0x6007896c, 0x3244, 0x4afd, { 0xbf, 0x18, 0xa6, 0xd3, 0xbe, 0xda, 0x50, 0x23 } };
>-static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } };
>-static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } };
>-static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } };
>-static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } };
>+static const GUID SDL_IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } };
>+static const GUID SDL_IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } };
>+static const GUID SDL_IID_IDXGIDevice3 = { 0x6007896c, 0x3244, 0x4afd, { 0xbf, 0x18, 0xa6, 0xd3, 0xbe, 0xda, 0x50, 0x23 } };
>+static const GUID SDL_IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } };
>+static const GUID SDL_IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } };
>+static const GUID SDL_IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } };
>+static const GUID SDL_IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } };
> 
> /* Direct3D 11.x shaders
> 
>@@ -961,7 +961,7 @@
>     blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
>     result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBlendState", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateBlendState", result);
>         return result;
>     }
> 
>@@ -1041,16 +1041,16 @@
>     }
> #endif /* __WINRT__ */
> 
>-    result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory);
>+    result = CreateDXGIFactoryFunc(&SDL_IID_IDXGIFactory2, &data->dxgiFactory);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", CreateDXGIFactory", result);
>         goto done;
>     }
> 
>     /* FIXME: Should we use the default adapter? */
>     result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", D3D11CreateDevice", result);
>         goto done;
>     }
> 
>@@ -1079,25 +1079,25 @@
>         &d3dContext /* Returns the device immediate context. */
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", D3D11CreateDevice", result);
>         goto done;
>     }
> 
>-    result = ID3D11Device_QueryInterface(d3dDevice, &IID_ID3D11Device1, &data->d3dDevice);
>+    result = ID3D11Device_QueryInterface(d3dDevice, &SDL_IID_ID3D11Device1, &data->d3dDevice);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to ID3D11Device1", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device to ID3D11Device1", result);
>         goto done;
>     }
> 
>-    result = ID3D11DeviceContext_QueryInterface(d3dContext, &IID_ID3D11DeviceContext1, &data->d3dContext);
>+    result = ID3D11DeviceContext_QueryInterface(d3dContext, &SDL_IID_ID3D11DeviceContext1, &data->d3dContext);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext to ID3D11DeviceContext1", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11DeviceContext to ID3D11DeviceContext1", result);
>         goto done;
>     }
> 
>-    result = ID3D11Device_QueryInterface(d3dDevice, &IID_IDXGIDevice1, &dxgiDevice);
>+    result = ID3D11Device_QueryInterface(d3dDevice, &SDL_IID_IDXGIDevice1, &dxgiDevice);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice1", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device to IDXGIDevice1", result);
>         goto done;
>     }
> 
>@@ -1106,7 +1106,7 @@
>      */
>     result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIDevice1::SetMaximumFrameLatency", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGIDevice1::SetMaximumFrameLatency", result);
>         goto done;
>     }
> 
>@@ -1135,7 +1135,7 @@
>             break;
> 
>         default:
>-            SDL_SetError(__FUNCTION__ ", Unexpected feature level: %d", data->featureLevel);
>+            SDL_SetError("%s, Unexpected feature level: %d", __FUNCTION__, data->featureLevel);
>             result = E_FAIL;
>             goto done;
>     }
>@@ -1148,7 +1148,7 @@
>         &data->vertexShader
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateVertexShader", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateVertexShader", result);
>         goto done;
>     }
> 
>@@ -1161,7 +1161,7 @@
>         &data->inputLayout
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateInputLayout", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateInputLayout", result);
>         goto done;
>     }
> 
>@@ -1173,7 +1173,7 @@
>         &data->colorPixelShader
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['color' shader]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreatePixelShader ['color' shader]", result);
>         goto done;
>     }
> 
>@@ -1184,7 +1184,7 @@
>         &data->texturePixelShader
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['textures' shader]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreatePixelShader ['textures' shader]", result);
>         goto done;
>     }
> 
>@@ -1195,7 +1195,7 @@
>         &data->yuvPixelShader
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['yuv' shader]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreatePixelShader ['yuv' shader]", result);
>         goto done;
>     }
> 
>@@ -1210,7 +1210,7 @@
>         &data->vertexShaderConstants
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex shader constants]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateBuffer [vertex shader constants]", result);
>         goto done;
>     }
> 
>@@ -1230,7 +1230,7 @@
>         &data->nearestPixelSampler
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [nearest-pixel filter]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateSamplerState [nearest-pixel filter]", result);
>         goto done;
>     }
> 
>@@ -1240,7 +1240,7 @@
>         &data->linearSampler
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [linear filter]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateSamplerState [linear filter]", result);
>         goto done;
>     }
> 
>@@ -1258,14 +1258,14 @@
>     rasterDesc.SlopeScaledDepthBias = 0.0f;
>     result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [main rasterizer]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateRasterizerState [main rasterizer]", result);
>         goto done;
>     }
> 
>     rasterDesc.ScissorEnable = TRUE;
>     result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->clippedRasterizer);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [clipped rasterizer]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateRasterizerState [clipped rasterizer]", result);
>         goto done;
>     }
> 
>@@ -1444,7 +1444,7 @@
>             &data->swapChain
>             );
>         if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForCoreWindow", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGIFactory2::CreateSwapChainForCoreWindow", result);
>             goto done;
>         }
>     } else if (usingXAML) {
>@@ -1454,18 +1454,18 @@
>             NULL,
>             &data->swapChain);
>         if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForComposition", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGIFactory2::CreateSwapChainForComposition", result);
>             goto done;
>         }
> 
> #if WINAPI_FAMILY == WINAPI_FAMILY_APP
>         result = ISwapChainBackgroundPanelNative_SetSwapChain(WINRT_GlobalSwapChainBackgroundPanelNative, (IDXGISwapChain *) data->swapChain);
>         if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ISwapChainBackgroundPanelNative::SetSwapChain", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ISwapChainBackgroundPanelNative::SetSwapChain", result);
>             goto done;
>         }
> #else
>-        SDL_SetError(__FUNCTION__ ", XAML support is not yet available for Windows Phone");
>+        SDL_SetError("%s, XAML support is not yet available for Windows Phone", __FUNCTION__);
>         result = E_FAIL;
>         goto done;
> #endif
>@@ -1484,13 +1484,13 @@
>             &data->swapChain
>             );
>         if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGIFactory2::CreateSwapChainForHwnd", result);
>             goto done;
>         }
> 
>         IDXGIFactory_MakeWindowAssociation(data->dxgiFactory, windowinfo.info.win.window, DXGI_MWA_NO_WINDOW_CHANGES);
> #else
>-        SDL_SetError(__FUNCTION__", Unable to find something to attach a swap chain to");
>+        SDL_SetError("%s, Unable to find something to attach a swap chain to", __FUNCTION__);
>         goto done;
> #endif  /* ifdef __WIN32__ / else */
>     }
>@@ -1545,7 +1545,7 @@
>              */
>             goto done;
>         } else if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGISwapChain::ResizeBuffers", result);
>             goto done;
>         }
> #endif
>@@ -1576,7 +1576,7 @@
>     if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) {
>         result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation);
>         if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::SetRotation", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGISwapChain1::SetRotation", result);
>             goto done;
>         }
>     }
>@@ -1584,11 +1584,11 @@
> 
>     result = IDXGISwapChain_GetBuffer(data->swapChain,
>         0,
>-        &IID_ID3D11Texture2D,
>+        &SDL_IID_ID3D11Texture2D,
>         &backBuffer
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::GetBuffer [back-buffer]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGISwapChain::GetBuffer [back-buffer]", result);
>         goto done;
>     }
> 
>@@ -1599,7 +1599,7 @@
>         &data->mainRenderTargetView
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device::CreateRenderTargetView", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device::CreateRenderTargetView", result);
>         goto done;
>     }
> 
>@@ -1661,9 +1661,9 @@
>     HRESULT result = S_OK;
>     IDXGIDevice3 *dxgiDevice = NULL;
> 
>-    result = ID3D11Device_QueryInterface(data->d3dDevice, &IID_IDXGIDevice3, &dxgiDevice);
>+    result = ID3D11Device_QueryInterface(data->d3dDevice, &SDL_IID_IDXGIDevice3, &dxgiDevice);
>     if (FAILED(result)) {
>-        //WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice3", result);
>+        //WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device to IDXGIDevice3", result);
>         return;
>     }
> 
>@@ -1747,7 +1747,7 @@
>         );
>     if (FAILED(result)) {
>         D3D11_DestroyTexture(renderer, texture);
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateTexture2D", result);
>         return -1;
>     }
> 
>@@ -1765,7 +1765,7 @@
>             );
>         if (FAILED(result)) {
>             D3D11_DestroyTexture(renderer, texture);
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateTexture2D", result);
>             return -1;
>         }
> 
>@@ -1776,7 +1776,7 @@
>             );
>         if (FAILED(result)) {
>             D3D11_DestroyTexture(renderer, texture);
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateTexture2D", result);
>             return -1;
>         }
>     }
>@@ -1792,7 +1792,7 @@
>         );
>     if (FAILED(result)) {
>         D3D11_DestroyTexture(renderer, texture);
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, "ID3D11Device1::CreateShaderResourceView", result);
>         return -1;
>     }
> 
>@@ -1804,7 +1804,7 @@
>             );
>         if (FAILED(result)) {
>             D3D11_DestroyTexture(renderer, texture);
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, "ID3D11Device1::CreateShaderResourceView", result);
>             return -1;
>         }
>         result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice,
>@@ -1814,7 +1814,7 @@
>             );
>         if (FAILED(result)) {
>             D3D11_DestroyTexture(renderer, texture);
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, "ID3D11Device1::CreateShaderResourceView", result);
>             return -1;
>         }
>     }
>@@ -1831,7 +1831,7 @@
>             &textureData->mainTextureRenderTargetView);
>         if (FAILED(result)) {
>             D3D11_DestroyTexture(renderer, texture);
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRenderTargetView", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateRenderTargetView", result);
>             return -1;
>         }
>     }
>@@ -1887,7 +1887,7 @@
>         NULL,
>         &stagingTexture);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
>         return -1;
>     }
> 
>@@ -1900,7 +1900,7 @@
>         &textureMemory
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11DeviceContext1::Map [map staging texture]", result);
>         SAFE_RELEASE(stagingTexture);
>         return -1;
>     }
>@@ -2062,7 +2062,7 @@
>         NULL,
>         &textureData->stagingTexture);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
>         return -1;
>     }
> 
>@@ -2075,7 +2075,7 @@
>         &textureMemory
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11DeviceContext1::Map [map staging texture]", result);
>         SAFE_RELEASE(textureData->stagingTexture);
>         return -1;
>     }
>@@ -2359,7 +2359,7 @@
>             &mappedResource
>             );
>         if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [vertex buffer]", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11DeviceContext1::Map [vertex buffer]", result);
>             return -1;
>         }
>         SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes);
>@@ -2383,7 +2383,7 @@
>             &rendererData->vertexBuffer
>             );
>         if (FAILED(result)) {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex buffer]", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateBuffer [vertex buffer]", result);
>             return -1;
>         }
> 
>@@ -2849,11 +2849,11 @@
>     /* Retrieve a pointer to the back buffer: */
>     result = IDXGISwapChain_GetBuffer(data->swapChain,
>         0,
>-        &IID_ID3D11Texture2D,
>+        &SDL_IID_ID3D11Texture2D,
>         &backBuffer
>         );
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::GetBuffer [get back buffer]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGISwapChain1::GetBuffer [get back buffer]", result);
>         goto done;
>     }
> 
>@@ -2870,7 +2870,7 @@
>         NULL,
>         &stagingTexture);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
>         goto done;
>     }
> 
>@@ -2902,7 +2902,7 @@
>         0,
>         &textureMemory);
>     if (FAILED(result)) {
>-        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result);
>+        WIN_SetErrorFromHRESULT2(__FUNCTION__, ", ID3D11DeviceContext1::Map [map staging texture]", result);
>         goto done;
>     }
> 
>@@ -2921,7 +2921,7 @@
>          * Get the error message, and attach some extra data to it.
>          */
>         char errorMessage[1024];
>-        SDL_snprintf(errorMessage, sizeof(errorMessage), __FUNCTION__ ", Convert Pixels failed: %s", SDL_GetError());
>+        SDL_snprintf(errorMessage, sizeof(errorMessage), "%s, Convert Pixels failed: %s", __FUNCTION__, SDL_GetError());
>         SDL_SetError("%s", errorMessage);
>         goto done;
>     }
>@@ -2991,7 +2991,7 @@
>             /* We probably went through a fullscreen <-> windowed transition */
>             D3D11_CreateWindowSizeDependentResources(renderer);
>         } else {
>-            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::Present", result);
>+            WIN_SetErrorFromHRESULT2(__FUNCTION__, ", IDXGISwapChain::Present", result);
>         }
>     }
> }

Actions: View | Diff

Attachments on bug 3399: 2533 | 2534

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.