Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge some commits from the base of new_rendering, should fix problems with rendering on MacOS in master #6756

Merged
merged 10 commits into from
Jun 10, 2022
Merged

merge some commits from the base of new_rendering, should fix problems with rendering on MacOS in master #6756

merged 10 commits into from
Jun 10, 2022

Commits on Jun 10, 2022

  1. display: Convert draw buffer to use textures not surfaces. 

    Many places are not completely converted, but rather just converting
a surface to a texture on the fly. This is likely to be very bad for
performance. However they can now be addressed one by one.
    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    23947d3 View commit details
    Browse the repository at this point in the history

  2. GUI1: remove remaining direct blits to screen surface.

    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    ddff684 View commit details
    Browse the repository at this point in the history

  3. Remove direct screen surface blits from minimap and show_dialog.

    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    2a88087 View commit details
    Browse the repository at this point in the history

  4. editor: store and draw palette button images as textures not surfaces.

    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    2af0497 View commit details
    Browse the repository at this point in the history

  5. Remove all remaining direct screen surface blits.

    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    e379aee View commit details
    Browse the repository at this point in the history

  6. CVideo: completely remove fake framebuffer compatibility surface. 

    This removes drawingSurface, and the compatibility shims blit_surface()
and render_low_res() entirely.

All draws should now use the new drawing interface in draw.cpp,
primarily draw::blit().

There are still things reading pixels back from the screen. These
should be phased out, but the interface will remain for screenshots
and the like.
    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    9347248 View commit details
    Browse the repository at this point in the history

  7. draw: allow null textures to be passed to draw functions. 

    They silently do nothing in this case.
    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    92ee4df View commit details
    Browse the repository at this point in the history

  8. Tests: Create fake window and real offscreen renderer for tests.

    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    950ff69 View commit details
    Browse the repository at this point in the history

  9. Tests: remove spurious filesystem test. 

    It was (a) spitting warnings, (b) deserving to do so because it was
relying on undefined behaviour, and (c) doing nothing that the check
directly above it hadn't just done.
    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    ed55d7f View commit details
    Browse the repository at this point in the history

  10. Tests: Fix WML tests. 

    Display no longer tries to draw or make buttons when it doesn't have
a screen, and the request for an empty theme name is treated as a
request for the default theme.
    @mesilliac
    mesilliac committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    072c22f View commit details
    Browse the repository at this point in the history