From dc748492c6f7eba549b6fee365181ffc0b8473d3 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 12 Nov 2020 12:06:33 +0000 Subject: [PATCH] (SVACE Issues Fix) Initialise uninitialised member variables Change-Id: Ief4f038f570daa911bc44274e9d960819e899497 --- dali/internal/graphics/gles/gl-extensions.cpp | 11 +++++++---- dali/internal/system/common/configuration-manager.cpp | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dali/internal/graphics/gles/gl-extensions.cpp b/dali/internal/graphics/gles/gl-extensions.cpp index 54c781a..f61d9dd 100644 --- a/dali/internal/graphics/gles/gl-extensions.cpp +++ b/dali/internal/graphics/gles/gl-extensions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,14 @@ namespace Adaptor GlExtensions::GlExtensions() : #ifdef GL_EXT_discard_framebuffer - mGlDiscardFramebuffer( NULL ), + mGlDiscardFramebuffer( nullptr ), #endif #ifdef GL_OES_get_program_binary - mGlGetProgramBinaryOES( NULL ), - mGlProgramBinaryOES( NULL ), + mGlGetProgramBinaryOES( nullptr ), + mGlProgramBinaryOES( nullptr ), +#endif +#ifdef GL_KHR_blend_equation_advanced + mBlendBarrierKHR( nullptr ), #endif mInitialized( false ) { diff --git a/dali/internal/system/common/configuration-manager.cpp b/dali/internal/system/common/configuration-manager.cpp index e37ae78..8ab98aa 100644 --- a/dali/internal/system/common/configuration-manager.cpp +++ b/dali/internal/system/common/configuration-manager.cpp @@ -82,6 +82,7 @@ ConfigurationManager::ConfigurationManager( std::string systemCachePath, EglGrap mEglGraphics( eglGraphics ), mThreadController( threadController ), mMaxTextureSize( 0u ), + mGlslVersion( 0u), mIsMultipleWindowSupported( true ), mIsAdvancedBlendEquationSupported( true ), mMaxTextureSizeCached( false ), -- 2.7.4