13
114
Fork
You've already forked zig-sdl3
19

WIP: Add SDL Shadercross & GPU Examples #126

Draft
Gota7 wants to merge 49 commits from shadercross into master
pull from: shadercross
merge into: 7Games:master
7Games:master
7Games:master-gpu
7Games:docs
7Games:image-updates
7Games:net-cleanup
7Games:vulkan-template
7Games:better-documentation-and-examples
7Games:145-web-ci
7Games:yaml-rework
Gota7 commented 2025年08月31日 20:57:35 +02:00 (Migrated from github.com)
Copy link

Closes #17

Closes #17
Gota7 commented 2025年08月31日 20:58:16 +02:00 (Migrated from github.com)
Copy link

What, there is no way to mark this as a draft like in gitlab? Github lame tbh. This is NOT ready yet!

What, there is no way to mark this as a draft like in gitlab? Github lame tbh. This is NOT ready yet!
JohnDoneth commented 2025年09月02日 19:58:39 +02:00 (Migrated from github.com)
Copy link

What, there is no way to mark this as a draft like in gitlab?

There is in the top right. I didn't realize it myself for a while. It's a bit hidden!

[画像:image]

Also awesome work. I'm looking forward to having shader reflection / runtime compilation / Zig shaders. Lots of really cool stuff in here.

> What, there is no way to mark this as a draft like in gitlab? There is in the top right. I didn't realize it myself for a while. It's a bit hidden! <img width="395" height="127" alt="image" src="https://github.com/user-attachments/assets/6cc3d13f-fc7a-4cbc-b037-20aa56a14c00" /> Also awesome work. I'm looking forward to having shader reflection / runtime compilation / Zig shaders. Lots of really cool stuff in here.
Gota7 commented 2025年09月06日 16:00:02 +02:00 (Migrated from github.com)
Copy link

What, there is no way to mark this as a draft like in gitlab?

There is in the top right. I didn't realize it myself for a while. It's a bit hidden!

[画像:image] Also awesome work. I'm looking forward to having shader reflection / runtime compilation / Zig shaders. Lots of really cool stuff in here.

Oh you're right, thank you!

> > What, there is no way to mark this as a draft like in gitlab? > > There is in the top right. I didn't realize it myself for a while. It's a bit hidden! > > <img alt="image" width="395" height="127" src="https://private-user-images.githubusercontent.com/3239951/484698154-6cc3d13f-fc7a-4cbc-b037-20aa56a14c00.png?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NTcxNjc0NjQsIm5iZiI6MTc1NzE2NzE2NCwicGF0aCI6Ii8zMjM5OTUxLzQ4NDY5ODE1NC02Y2MzZDEzZi1mYzdhLTRjYmMtYjAzNy0yMGFhNTZhMTRjMDAucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDkwNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTA5MDZUMTM1OTI0WiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NzJjNWQzMjc0MDUyMjI1YTE0NDU3NGJlZTMyODVmZDkxZGM2NzE1OTYwNDYyMzc0NGRmMTg5MDcwNjg5YTIwMiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.lHOCg_1qi4s2tjEowZNo5p__QHB6GgbDkR4G2d905bw"> > Also awesome work. I'm looking forward to having shader reflection / runtime compilation / Zig shaders. Lots of really cool stuff in here. Oh you're right, thank you!
Gota7 force-pushed shadercross from f430101331
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
to 6767e2a95d
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
2026年03月11日 02:46:11 +01:00 Compare
GPU Template DXC
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
8056c820dc
Fix Shadercross Recompilation
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
3e98dc7bfe
GPU Template Embedded Shader Loading
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
a6bd4c9a32
Shader Compatibility Checking
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
59196ce7bd
Shader Reflection WIP
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
fc9a3e26ff
Some checks failed
test / Build Documentation (pull_request) Has been cancelled
test / Build Examples (pull_request) Has been cancelled
test / Build GPU Examples (pull_request) Has been cancelled
test / Build Template (pull_request) Has been cancelled
test / Testing (pull_request) Has been cancelled
This pull request has changes conflicting with the target branch.
  • .forgejo/workflows/test.yaml
  • build.zig
  • build.zig.zon
  • build/shadercross.zig
  • build/shaders.zig
  • build/tools/shader_metadata2zon.zig
  • gpu_examples/build.zig
  • gpu_examples/build.zig.zon
  • gpu_examples/src/basic-compute.zig
  • gpu_examples/src/basic-triangle.zig
  • gpu_examples/src/clear-screen.zig
  • gpu_examples/src/images/ravioli.bmp
  • gpu_examples/src/textured-quad.zig
  • src/extras.zig
  • src/extras/gpu.zig
  • src/extras/gpu/GraphicsShaderMetadata.zig
  • src/shadercross.zig
  • template/src/main.zig
  • templates/renderer/src/data/trees.jpeg
  • templates/renderer/src/html/main.zig
  • templates/renderer/src/main.zig
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin shadercross:shadercross
git switch shadercross

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff shadercross
git switch shadercross
git rebase master
git switch master
git merge --ff-only shadercross
git switch shadercross
git rebase master
git switch master
git merge --no-ff shadercross
git switch master
git merge --squash shadercross
git switch master
git merge --ff-only shadercross
git switch master
git merge shadercross
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
7Games/zig-sdl3!126
Reference in a new issue
7Games/zig-sdl3
No description provided.
Delete branch "shadercross"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?