search

KhronosGroup / GLSL

GLSL Shading Language Specification and Extensions
Other
337 stars 98 forks source link

Glsl huawei cluster culling shader #222

Open wycwang0823 opened 10 months ago

wycwang0823 commented 10 months ago

please merge this change. thank you.

wycwang0823 commented 9 months ago

conflict resolved, please help to merge this change. thank you.

wycwang0823 commented 9 months ago

Hi pdaniell, I tried to fixing conflict and then click "mark as resolved" button. But the "conflict" situation seems to still exist.

pdaniell-nv commented 9 months ago

@gnl21 may have a better suggestion, but it appears you need to rebase to the latest in main and then merge your conflicts locally, commit and push that.

oddhack commented 1 month ago

When resolving conflicts, please note that you will also need to move any changes in this branch to README.md, to corresponding asciidoc markup in README.adoc, and remove README.md .