Refactor: BLF Use Vector for Glyph Cache List #118174

Closed
Harley Acheson wants to merge 3 commits from Harley/blender:BlfGlyphCacheList into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Member

Replace FontBLF's ListBase with a GlyphCacheListBLF class that uses a
blender::Vector of GlyphCacheBLF, holds the std::mutex, has methods for
acquire, release, clear. Seems like a simple first step.

Replace FontBLF's ListBase with a GlyphCacheListBLF class that uses a blender::Vector of GlyphCacheBLF, holds the std::mutex, has methods for acquire, release, clear. Seems like a simple first step.
Harley Acheson added 2 commits 2024-02-13 02:20:20 +01:00
74f1887d7e Refactor: BLF Use Vector for Glyph Cache List
Replace FontBLF's ListBase with a GlyphCacheListBLF class that uses a
vector of GlyphCacheBLF, holds the ThreadMutex, has methods for
acquire, release, clear. Seems like a simple first step.
Harley Acheson added this to the User Interface project 2024-02-13 02:20:38 +01:00
Harley Acheson requested review from Hans Goudey 2024-02-13 02:20:44 +01:00
Hans Goudey requested changes 2024-02-13 02:49:16 +01:00
Hans Goudey left a comment
Member

I like this iteration, the diff looks very simple.

I like this iteration, the diff looks very simple.
@ -171,0 +148,4 @@
GlyphCacheBLF *gc = nullptr;
for (auto &entry : list) {
Member

Typically we don't use auto unless the type name is already written on a line (for example with casting) or it's actually not possible to write concretely. That's because it's helpful information to the reader who would have to look elsewhere otherwise.

Typically we don't use `auto` unless the type name is already written on a line (for example with casting) or it's actually not possible to write concretely. That's because it's helpful information to the reader who would have to look elsewhere otherwise.
Harley marked this conversation as resolved
@ -107,2 +109,4 @@
} KerningCacheBLF;
class GlyphCacheListBLF {
private:
Member

private is redundant for classes which are private by default

`private` is redundant for classes which are private by default
Harley marked this conversation as resolved
@ -108,1 +110,4 @@
class GlyphCacheListBLF {
private:
std::vector<GlyphCacheBLF *> list;
Member

blender::Vector is generally preferable since it has methods to work better with other Blender containers, and it has an inline buffer to avoid allocations for small numbers of elements

`blender::Vector` is generally preferable since it has methods to work better with other Blender containers, and it has an inline buffer to avoid allocations for small numbers of elements
Harley marked this conversation as resolved
@ -109,0 +115,4 @@
FontBLF *font;
/** Mutex lock for glyph cache. */
ThreadMutex glyph_cache_mutex;
Member

It would probably be simpler/easy to switch to std::mutex now too :)

It would probably be simpler/easy to switch to `std::mutex` now too :)
Harley marked this conversation as resolved
Harley Acheson added 1 commit 2024-02-13 20:17:27 +01:00
Author
Member

@HooglyBoogly - I like this iteration, the diff looks very simple.

Yes, I thought it best start with just this glyph cache list first to make sure that I'm doing it right.

blender::Vector is generally preferable... switch to std::mutex now too

Thanks! Done.

> @HooglyBoogly - I like this iteration, the diff looks very simple. Yes, I thought it best start with just this glyph cache list first to make sure that I'm doing it right. > blender::Vector is generally preferable... switch to std::mutex now too Thanks! Done.
Hans Goudey reviewed 2024-02-13 21:20:44 +01:00
@ -108,1 +112,4 @@
class GlyphCacheListBLF {
blender::Vector<GlyphCacheBLF *> list;
FontBLF *font;
Member

Sorry, I didn't realize this pointer here as the resolution to the need to pass "font" to the functions. I'll propose an alternative change to see what you think

Sorry, I didn't realize this pointer here as the resolution to the need to pass "font" to the functions. I'll propose an alternative change to see what you think
Author
Member

Closing. Done better in Hans' #118222

Closing. Done better in Hans' #118222
Harley Acheson closed this pull request 2024-02-24 21:28:37 +01:00

Pull request closed

Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#118174
No description provided.