[Bf-blender-cvs] [4df3cf020bd] master: Fix uninitialized variable use for ID3D11RenderTargetView
Campbell Barton
noreply at git.blender.org
Wed Aug 31 07:05:21 CEST 2022
Commit: 4df3cf020bd0038f5533382989a05f4e4f76a111
Author: Campbell Barton
Date: Wed Aug 31 14:26:56 2022 +1000
Branches: master
https://developer.blender.org/rB4df3cf020bd0038f5533382989a05f4e4f76a111
Fix uninitialized variable use for ID3D11RenderTargetView
When 'm_render_target' was NULL, backbuffer_res would be used without
being assigned. While it seems likely this code-path is rarely used
(if at all), resolve the logical error.
===================================================================
M intern/ghost/intern/GHOST_ContextD3D.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_ContextD3D.cpp b/intern/ghost/intern/GHOST_ContextD3D.cpp
index 4fc05cf912c..857323941ea 100644
--- a/intern/ghost/intern/GHOST_ContextD3D.cpp
+++ b/intern/ghost/intern/GHOST_ContextD3D.cpp
@@ -123,8 +123,6 @@ class GHOST_SharedOpenGLResource {
ID3D11RenderTargetView *render_target = nullptr)
: m_device(device), m_device_ctx(device_ctx), m_cur_width(width), m_cur_height(height)
{
- ID3D11Resource *backbuffer_res;
-
if (!render_target) {
D3D11_TEXTURE2D_DESC texDesc{};
D3D11_RENDER_TARGET_VIEW_DESC renderTargetViewDesc{};
@@ -157,11 +155,12 @@ class GHOST_SharedOpenGLResource {
m_render_target = render_target;
if (m_render_target) {
+ ID3D11Resource *backbuffer_res = nullptr;
m_render_target->GetResource(&backbuffer_res);
- }
- if (backbuffer_res) {
- backbuffer_res->QueryInterface<ID3D11Texture2D>(&m_render_target_tex);
- backbuffer_res->Release();
+ if (backbuffer_res) {
+ backbuffer_res->QueryInterface<ID3D11Texture2D>(&m_render_target_tex);
+ backbuffer_res->Release();
+ }
}
if (!m_render_target || !m_render_target_tex) {
More information about the Bf-blender-cvs
mailing list