Skip to content
Snippets Groups Projects

shaders master merge and mipmap fix

Merged shaders master merge and mipmap fix
fickleheart/SRB2:shaders-222 into sal-oglshaderport
Merged colette requested to merge fickleheart/SRB2:shaders-222 into sal-oglshaderport

I'm submitting this PR because I tried backporting the mipmap fix to plain master and keep getting crashes. Since that fix would conflict with shaders anyway and mipmaps aren't a huge gamebreaking feature, I figure it's fine to just leave them in shaders....

the fix is ensuring that mipmap textures are always powers of 2 in MakePatch. I haven't fully tested this, including seeing if it breaks non-po2 walltextures.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
src/r_patch.c
3 3 // Copyright (C) 1993-1996 by id Software, Inc.
4 4 // Copyright (C) 2005-2009 by Andrey "entryway" Budko.
5 5 // Copyright (C) 2018-2020 by Jaime "Lactozilla" Passos.
6 // Copyright (C) 2019-2020 by Sonic Team Junior.
  • colette
    colette @fickleheart ·
    Author Contributor

    I think this PR inherited diff comments from the master commits that were merged in? Weird.

  • colette closed

    closed

  • colette reopened

    reopened

  • James R. merged

    merged

  • James R. mentioned in commit 9f7a0a11

    mentioned in commit 9f7a0a11

    • Please register or sign in to reply