Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
SRB2
SRB2
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 265
    • Issues 265
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 74
    • Merge Requests 74
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2SRB2
  • Merge Requests
  • !1066

Merged
Opened Jul 14, 2020 by James Hale@SwitchKaze 
  • Report abuse
Report abuse

Fix skincolor-related memory leak

Currently, any change to a skincolor's ramp will cause the entire translation colormap cache to be cleared. Since this doesn't actually free the cached colormaps (since they're freed when PU_LEVEL blocks are purged), they remain in memory. Furthermore, animated skincolors take advantage of the fact that skincolor ramps are R+W and modify them often, worsening the issue and leading to a noticeable, continuous increase in memory usage.

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.do.srb2.org/SwitchKaze/SRB2.git next-lc-uint16
git checkout -b SwitchKaze/SRB2-next-lc-uint16 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout next
git merge --no-ff SwitchKaze/SRB2-next-lc-uint16

Step 4. Push the result of the merge to GitLab

git push origin next

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 1
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • SteelT @SteelTitanium

    changed milestone to 2.2.7

    Jul 14, 2020

    changed milestone to 2.2.7

    changed milestone to %8
    Toggle commit list
  • James R. @james

    merged

    Jul 17, 2020

    merged

    merged
    Toggle commit list
  • James R. @james

    mentioned in commit 7c2f81e4

    Jul 17, 2020

    mentioned in commit 7c2f81e4

    mentioned in commit 7c2f81e4ed768a5582017f149ba710b4f6c7db76
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
2.2.7
Milestone
2.2.7
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: STJr/SRB2!1066
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.