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.

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

[E387] Merge from upstream #758

Merged
merged 2,135 commits into from
Feb 4, 2025
Merged

[E387] Merge from upstream #758

merged 2,135 commits into from
Feb 4, 2025

Conversation

w23
Copy link
Owner

@w23 w23 commented Jan 23, 2025

  • Do initial merge
  • Designated initialize all ref_interface_t funcs
  • Make ref_vk build
  • CI passes
  • Brush geometry is skewed
  • playdemo assert fail in R_BeginFrame()
    • implemented a workaround
    • ? waiting for upstream fix (see E388, first 45min) -- workaround is fine
  • Make sure it works
  • Run render tests
    • missing surface lights, e.g. on brush01, brush2_01, etc
    • weird violet blobs and noisy pixels
  • Missing textures: map c0a0b then map c0a0c
  • Garbage at the bottom of the frame on the first non-trivial R_BeginFrame (w/ debugger)
    • Check vs vulkan branch
  • Diff+check non-ref_vk (engine) changes
  • Fixup ktx2 unused cursor var

SNMetamorph and others added 30 commits December 2, 2024 20:36
In some configuration, like Flatpak, on dev machines or when packaging for *nix
we can safely link with system libraries.
…ctions that's engine core or server are dependent on
… directories to the include path.

Also, set cmake minimum required version to 3.5 only to shut up deprecation notice.
…generated files

This helps avoid issue when the bzip2 or libogg are compiled before header is
generated for them.
In theory, we shouldn't do that, but I guess dependency calculation through
include directives doesn't work when the file doesn't exist.
…lower than 24

In API level 21 **and** _FILE_OFFSET_BITS == 64 we don't get fseeko/ftello functions.
To avoid increasing API level, just set _FILE_OFFSET_BITS to some bogus value.
Undefining it doesn't work as opusfile sets it to 64 automatically.
…ific implementations of Platform_Sleep to make them inlined
@w23
Copy link
Owner Author

w23 commented Jan 25, 2025

лол CI среньк, потому что vulkan.lunarg.com лёг полежать

w23 added 5 commits January 27, 2025 10:40
See stream E388 in its entirety for discussion.
TLDR: the engine won't call `R_EndFrame()` if there was nothing to draw,
as this prevents rendering artifacts on some devices. ref_vk wasn't
ready for any of that.
Some maps fail to load. Possibly drivers have changed and require bigger
buffer.

Related: #744, #502, etc
Make `R_TextureUploadFromBuffer` properly track reference counts under
ref-api semantics. Started appearing by the merge, probably the engine started
using this function slightly differently.

Missing textures were sometimes triggered by the presence of the texture in PBR
patches. See stream E389.
@w23
Copy link
Owner Author

w23 commented Jan 30, 2025

Fixing missing textures also fixed a bunch of violet garbage and missing lights it seems.

@w23 w23 marked this pull request as ready for review February 4, 2025 16:00
@w23 w23 merged commit 2bfd506 into vulkan Feb 4, 2025
18 checks passed
@w23 w23 deleted the stream-E387-merge-from-upstream-f0b29ba branch February 4, 2025 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants