summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdeel Kazmi <adeel.kazmi@samsung.com>2024-02-07 12:02:08 +0000
committerAdeel Kazmi <adeel.kazmi@samsung.com>2024-02-07 12:02:08 +0000
commit11f95cf0350543da87ad0c2bf040156c017d1ae9 (patch)
tree9d3d2cbbd49a56900da5f55eb34926d1c686383e
parent67cbe20c6441a01ca9ba9bcdfd1ed83b38cf5c34 (diff)
downloaddali-adaptor-11f95cf0350543da87ad0c2bf040156c017d1ae9.tar.gz
dali-adaptor-11f95cf0350543da87ad0c2bf040156c017d1ae9.tar.bz2
dali-adaptor-11f95cf0350543da87ad0c2bf040156c017d1ae9.zip
Fix SVACE errors in various files
Change-Id: Id61fd85f7f03e4650fa3746f412b70d248618b80
-rw-r--r--dali/internal/graphics/gles-impl/gles-graphics-pipeline.cpp8
-rw-r--r--dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp37
-rw-r--r--dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp63
3 files changed, 56 insertions, 52 deletions
diff --git a/dali/internal/graphics/gles-impl/gles-graphics-pipeline.cpp b/dali/internal/graphics/gles-impl/gles-graphics-pipeline.cpp
index 5454c84df..a927fadc8 100644
--- a/dali/internal/graphics/gles-impl/gles-graphics-pipeline.cpp
+++ b/dali/internal/graphics/gles-impl/gles-graphics-pipeline.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -91,8 +91,10 @@ auto& PipelineImpl::GetController() const
void PipelineImpl::Bind(const uint32_t glProgram) const
{
- auto& gl = *GetController().GetGL();
- gl.UseProgram(glProgram);
+ if(auto gl = GetController().GetGL())
+ {
+ gl->UseProgram(glProgram);
+ }
}
void PipelineImpl::Retain()
diff --git a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
index 038410ae0..92b4ef01f 100644
--- a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
+++ b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -74,28 +74,29 @@ void* Memory2::LockRegion(uint32_t offset, uint32_t size)
void Memory2::Unlock(bool flush)
{
- auto gl = mController.GetGL();
-
- // for buffer...
- if(mMapObjectType == MapObjectType::BUFFER && mMappedPointer)
+ if(auto gl = mController.GetGL())
{
- auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
- if(!buffer->IsCPUAllocated())
+ // for buffer...
+ if(mMapObjectType == MapObjectType::BUFFER && mMappedPointer)
{
- buffer->Bind(BufferUsage::VERTEX_BUFFER);
- gl->BufferSubData(GL_ARRAY_BUFFER, GLintptr(mMapBufferInfo.offset), GLsizeiptr(mMapBufferInfo.size), mMappedPointer);
+ auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
+ if(!buffer->IsCPUAllocated())
+ {
+ buffer->Bind(BufferUsage::VERTEX_BUFFER);
+ gl->BufferSubData(GL_ARRAY_BUFFER, GLintptr(mMapBufferInfo.offset), GLsizeiptr(mMapBufferInfo.size), mMappedPointer);
+ }
}
- }
- if(mIsAllocatedLocally)
- {
- free(mMappedPointer);
- mMappedPointer = nullptr;
- }
+ if(mIsAllocatedLocally)
+ {
+ free(mMappedPointer);
+ mMappedPointer = nullptr;
+ }
- if(flush)
- {
- Flush();
+ if(flush)
+ {
+ Flush();
+ }
}
}
diff --git a/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp b/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp
index 9dd9f5104..18e78616a 100644
--- a/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp
+++ b/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -49,50 +49,51 @@ Memory3::~Memory3()
void* Memory3::LockRegion(uint32_t offset, uint32_t size)
{
- auto gl = mController.GetGL();
-
- if(mMapObjectType == MapObjectType::BUFFER)
+ if(auto gl = mController.GetGL())
{
- auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
-
- if(buffer->IsCPUAllocated())
- {
- using Ptr = char*;
- mMappedPointer = Ptr(buffer->GetCPUAllocatedAddress()) + offset;
- }
- else
+ if(mMapObjectType == MapObjectType::BUFFER)
{
- gl->BindBuffer(GL_COPY_WRITE_BUFFER, buffer->GetGLBuffer());
- void* ptr = nullptr;
- ptr = gl->MapBufferRange(GL_COPY_WRITE_BUFFER, GLintptr(mMapBufferInfo.offset), GLsizeiptr(mMapBufferInfo.size), GL_MAP_WRITE_BIT);
- mMappedPointer = ptr;
+ auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
+
+ if(buffer->IsCPUAllocated())
+ {
+ using Ptr = char*;
+ mMappedPointer = Ptr(buffer->GetCPUAllocatedAddress()) + offset;
+ }
+ else
+ {
+ gl->BindBuffer(GL_COPY_WRITE_BUFFER, buffer->GetGLBuffer());
+ void* ptr = nullptr;
+ ptr = gl->MapBufferRange(GL_COPY_WRITE_BUFFER, GLintptr(mMapBufferInfo.offset), GLsizeiptr(mMapBufferInfo.size), GL_MAP_WRITE_BIT);
+ mMappedPointer = ptr;
+ }
+ return mMappedPointer;
}
- return mMappedPointer;
}
-
return nullptr;
}
void Memory3::Unlock(bool flush)
{
- auto gl = mController.GetGL();
-
- if(mMapObjectType == MapObjectType::BUFFER && mMappedPointer)
+ if(auto gl = mController.GetGL())
{
- auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
- if(!buffer->IsCPUAllocated())
+ if(mMapObjectType == MapObjectType::BUFFER && mMappedPointer)
{
- gl->BindBuffer(GL_COPY_WRITE_BUFFER, buffer->GetGLBuffer());
- gl->UnmapBuffer(GL_COPY_WRITE_BUFFER);
+ auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
+ if(!buffer->IsCPUAllocated())
+ {
+ gl->BindBuffer(GL_COPY_WRITE_BUFFER, buffer->GetGLBuffer());
+ gl->UnmapBuffer(GL_COPY_WRITE_BUFFER);
+ }
}
- }
- if(flush)
- {
- Flush();
- }
+ if(flush)
+ {
+ Flush();
+ }
- mMappedPointer = nullptr;
+ mMappedPointer = nullptr;
+ }
}
void Memory3::Flush()