From 1154c012668b510663e4ebd11e8d628c023f7986 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Wed, 24 Jul 2019 14:51:59 +0200 Subject: [PATCH] libobs-d3d11: Catch be reference --- libobs-d3d11/d3d11-duplicator.cpp | 4 +-- libobs-d3d11/d3d11-rebuild.cpp | 2 +- libobs-d3d11/d3d11-subsystem.cpp | 44 +++++++++++++++---------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libobs-d3d11/d3d11-duplicator.cpp b/libobs-d3d11/d3d11-duplicator.cpp index ba6c60d4d..a9e27c76f 100644 --- a/libobs-d3d11/d3d11-duplicator.cpp +++ b/libobs-d3d11/d3d11-duplicator.cpp @@ -87,7 +87,7 @@ EXPORT bool device_get_duplicator_monitor_info(gs_device_t *device, if (FAILED(hr)) throw HRError("GetDesc failed", hr); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_get_duplicator_monitor_info: " "%s (%08lX)", @@ -151,7 +151,7 @@ EXPORT gs_duplicator_t *device_duplicator_create(gs_device_t *device, blog(LOG_DEBUG, "device_duplicator_create: %s", error); return nullptr; - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_DEBUG, "device_duplicator_create: %s (%08lX)", error.str, error.hr); return nullptr; diff --git a/libobs-d3d11/d3d11-rebuild.cpp b/libobs-d3d11/d3d11-rebuild.cpp index 51d0660cc..8a797e567 100644 --- a/libobs-d3d11/d3d11-rebuild.cpp +++ b/libobs-d3d11/d3d11-rebuild.cpp @@ -405,6 +405,6 @@ try { } catch (const char *error) { bcrash("Failed to recreate D3D11: %s", error); -} catch (HRError error) { +} catch (HRError &error) { bcrash("Failed to recreate D3D11: %s (%08lX)", error.str, error.hr); } diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp index e6f1b3d69..e530da634 100644 --- a/libobs-d3d11/d3d11-subsystem.cpp +++ b/libobs-d3d11/d3d11-subsystem.cpp @@ -342,7 +342,7 @@ try { } return bad_driver; -} catch (HRError error) { +} catch (HRError &error) { blog(LOG_WARNING, "HasBadNV12Output failed: %s (%08lX)", error.str, error.hr); return false; @@ -712,7 +712,7 @@ bool device_enum_adapters(bool (*callback)(void *param, const char *name, EnumD3DAdapters(callback, param); return true; - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_WARNING, "Failed enumerating devices: %s (%08lX)", error.str, error.hr); return false; @@ -792,12 +792,12 @@ int device_create(gs_device_t **p_device, uint32_t adapter) device = new gs_device(adapter); - } catch (UnsupportedHWError error) { + } catch (UnsupportedHWError &error) { blog(LOG_ERROR, "device_create (D3D11): %s (%08lX)", error.str, error.hr); errorcode = GS_ERROR_NOT_SUPPORTED; - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_create (D3D11): %s (%08lX)", error.str, error.hr); errorcode = GS_ERROR_FAIL; @@ -831,7 +831,7 @@ gs_swapchain_t *device_swapchain_create(gs_device_t *device, try { swap = new gs_swap_chain(device, data); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_swapchain_create (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -861,7 +861,7 @@ void device_resize(gs_device_t *device, uint32_t cx, uint32_t cy) depthView = device->curZStencilBuffer->view; device->context->OMSetRenderTargets(1, &renderView, depthView); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_resize (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -911,7 +911,7 @@ gs_texture_t *device_texture_create(gs_device_t *device, uint32_t width, texture = new gs_texture_2d(device, width, height, color_format, levels, data, flags, GS_TEXTURE_2D, false); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_texture_create (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -932,7 +932,7 @@ gs_texture_t *device_cubetexture_create(gs_device_t *device, uint32_t size, texture = new gs_texture_2d(device, size, size, color_format, levels, data, flags, GS_TEXTURE_CUBE, false); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_cubetexture_create (D3D11): %s " "(%08lX)", @@ -971,7 +971,7 @@ gs_zstencil_t *device_zstencil_create(gs_device_t *device, uint32_t width, try { zstencil = new gs_zstencil_buffer(device, width, height, format); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_zstencil_create (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -988,7 +988,7 @@ gs_stagesurf_t *device_stagesurface_create(gs_device_t *device, uint32_t width, try { surf = new gs_stage_surface(device, width, height, color_format); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_stagesurface_create (D3D11): %s " "(%08lX)", @@ -1006,7 +1006,7 @@ device_samplerstate_create(gs_device_t *device, gs_sampler_state *ss = NULL; try { ss = new gs_sampler_state(device, info); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_samplerstate_create (D3D11): %s " "(%08lX)", @@ -1025,14 +1025,14 @@ gs_shader_t *device_vertexshader_create(gs_device_t *device, try { shader = new gs_vertex_shader(device, file, shader_string); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_vertexshader_create (D3D11): %s " "(%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); - } catch (ShaderError error) { + } catch (ShaderError &const error) { const char *buf = (const char *)error.errors->GetBufferPointer(); if (error_string) @@ -1058,14 +1058,14 @@ gs_shader_t *device_pixelshader_create(gs_device_t *device, try { shader = new gs_pixel_shader(device, file, shader_string); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_pixelshader_create (D3D11): %s " "(%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); - } catch (ShaderError error) { + } catch (ShaderError &const error) { const char *buf = (const char *)error.errors->GetBufferPointer(); if (error_string) @@ -1089,7 +1089,7 @@ gs_vertbuffer_t *device_vertexbuffer_create(gs_device_t *device, gs_vertex_buffer *buffer = NULL; try { buffer = new gs_vertex_buffer(device, data, flags); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_vertexbuffer_create (D3D11): %s " "(%08lX)", @@ -1111,7 +1111,7 @@ gs_indexbuffer_t *device_indexbuffer_create(gs_device_t *device, gs_index_buffer *buffer = NULL; try { buffer = new gs_index_buffer(device, type, indices, num, flags); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_indexbuffer_create (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -1558,7 +1558,7 @@ void device_draw(gs_device_t *device, enum gs_draw_mode draw_mode, blog(LOG_ERROR, "device_draw (D3D11): %s", error); return; - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_draw (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -2275,7 +2275,7 @@ device_texture_create_gdi(gs_device_t *device, uint32_t width, uint32_t height) texture = new gs_texture_2d(device, width, height, GS_BGRA, 1, nullptr, GS_RENDER_TARGET, GS_TEXTURE_2D, true); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_texture_create_gdi (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -2333,7 +2333,7 @@ extern "C" EXPORT gs_texture_t *device_texture_open_shared(gs_device_t *device, gs_texture *texture = nullptr; try { texture = new gs_texture_2d(device, handle); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "gs_texture_open_shared (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -2420,7 +2420,7 @@ device_texture_create_nv12(gs_device_t *device, gs_texture_t **p_tex_y, true); tex_uv = new gs_texture_2d(device, tex_y->texture, flags); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "gs_texture_create_nv12 (D3D11): %s (%08lX)", error.str, error.hr); LogD3D11ErrorDetails(error, device); @@ -2446,7 +2446,7 @@ device_stagesurface_create_nv12(gs_device_t *device, uint32_t width, gs_stage_surface *surf = NULL; try { surf = new gs_stage_surface(device, width, height); - } catch (HRError error) { + } catch (HRError &error) { blog(LOG_ERROR, "device_stagesurface_create (D3D11): %s " "(%08lX)",