Skip to content
Snippets Groups Projects

Renderer switching

Merged Renderer switching
renderswitch into master
1 unresolved thread
Merged Lactozilla requested to merge renderswitch into master
1 unresolved thread

Oh hi, this is "james". This MR now also adds CV_NOLUA. Cvars with this flag cannot be set via Lua. renderer has this flag.

Hi this is bird.

srb20021

Edited by James R.

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/sdl/i_video.c
1627 1641 ))
1628 1642 framebuffer = SDL_TRUE;
1629 1643 }
1630 if (M_CheckParm("-software"))
1631 {
1644
1645 #ifdef HWRENDER
1646 if (M_CheckParm("-opengl"))
1647 rendermode = render_opengl;
1648 else if (M_CheckParm("software"))
  • Lactozilla added 1 commit

    added 1 commit

    • 79daafd8 - Fix missing "-" prefix on "-software" cmdline parm

    Compare with previous version

  • SteelT
    SteelT @SteelT ·
    Owner

    This suffers from the same bug as the 2.1 version did, where seitching to software on Linux would leave you with blank screen

  • Lactozilla marked as a Work In Progress

    marked as a Work In Progress

  • Lactozilla added 12 commits

    added 12 commits

    • 79daafd8...1771c7c8 - 9 commits from branch master
    • 5c8604ae - Merge remote-tracking branch 'origin/master' into renderswitch
    • 77747c66 - Fix switching to software
    • 4e349cbd - Remove W_UnlockCachedPatch calls to avoid crashing

    Compare with previous version

    Toggle commit list
  • Lactozilla unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Lactozilla
    Lactozilla @Lactozilla ·
    Author Contributor

    fixed by cherrypicking 77747c66df62e4c110c899f3b8be252a0c0db0aa i hope

  • SteelT
    SteelT @SteelT ·
    Owner

    Fix seems to work

  • Lactozilla added 66 commits

    added 66 commits

    Compare with previous version

  • James R.
    James R. @james ·
    Owner

    Why is renderer hidden?

  • Lactozilla
    Lactozilla @Lactozilla ·
    Author Contributor

    Take a wild guess

  • James R.
    James R. @james ·
    Owner

    ??????????

  • James R.
    James R. @james ·
    Owner

    Is this something dumb like Lua changing it?

  • Lactozilla
    Lactozilla @Lactozilla ·
    Author Contributor

    Yes!

  • James R.
    James R. @james ·
    Owner

    :rofl:

  • Lactozilla
    Lactozilla @Lactozilla ·
    Author Contributor

    Not even my decision!

  • James R.
    James R. @james ·
    Owner

    Well I know the concern there so maybe I'll just write something to make it work in cnosole, but not from Lua...

  • James R. added 3 commits

    added 3 commits

    • f26bdf00 - A system to encode flags in the command buffer
    • cb29a9dd - CV_NOLUA for when a cvar should not be changed via Lua
    • 4959d52a - Make cv_renderer CV_NOLUA instead of hidden!!!

    Compare with previous version

  • James R. changed the description

    changed the description

  • James R. added 1 commit

    added 1 commit

    Compare with previous version

  • James R. added 1 commit

    added 1 commit

    Compare with previous version

  • James R. added 1 commit

    added 1 commit

    Compare with previous version

  • Lactozilla added 5 commits

    added 5 commits

    Compare with previous version

    Toggle commit list
  • Lactozilla added 1 commit

    added 1 commit

    Compare with previous version

  • Lactozilla added 1 commit

    added 1 commit

    • 5ea43aa0 - Fix sprite rotation crashes.

    Compare with previous version

  • Alam Ed Arias
    Alam Ed Arias @Alam started a thread on commit 5ea43aa0
    • src/r_patch.c
    1374 1374 skinsprites++;
    1375 1375 }
    1376 1376 }
    1377
    1378 //
    1379 // R_FreeAllRotSprite
    1380 //
    1381 // Free ALL sprite rotation data from memory.
    1382 //
    1383 void R_FreeAllRotSprite(void)
    1384 {
    1385 INT32 i;
    1386 for (i = 0; i < numsprites; i++)
    • Alam Ed Arias
      Alam Ed Arias @Alam ·
      Maintainer 
      r_patch.c:1386:16: error: comparison of integer expressions of different signedness: 'int32_t' {aka 'int'} and 'size_t' {aka 'unsigned int'} [-Werror=sign-compare]
 1386 |  for (i = 0; i < numsprites; i++)
      |                ^
cc1.exe: all warnings being treated as errors```
    • Please register or sign in to reply
  • Alam Ed Arias added 1 commit

    added 1 commit

    • c394ad05 - use size_t to count the sprites

    Compare with previous version

  • James R. added 2 commits

    added 2 commits

    • 569453ee - Warn when going to OpenGL from the menu
    • 7886a4bb - Don't warn if we start in OpenGL

    Compare with previous version

  • James R. changed the description

    changed the description

  • James R. merged

    merged

  • James R. mentioned in commit 5e5f3c4f

    mentioned in commit 5e5f3c4f

    • Please register or sign in to reply