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

[bug] [gui] Fix a bug of drawing mesh instacing that cpu/cuda objects have an offset when copying to vulkan object #6028

Merged
merged 9 commits into from
Sep 20, 2022

Conversation

Morcki
Copy link
Member

@Morcki Morcki commented Sep 10, 2022

This only happend on Windows.

@netlify
Copy link

netlify bot commented Sep 10, 2022

Deploy Preview for docsite-preview ready!

Name Link
🔨 Latest commit 8d5fdca
🔍 Latest deploy log https://app.netlify.com/sites/docsite-preview/deploys/632848be944a660008d70237
😎 Deploy Preview https://deploy-preview-6028--docsite-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@Morcki Morcki requested a review from bobcao3 September 13, 2022 08:58
@Morcki Morcki added this to the v1.1.3 milestone Sep 15, 2022
@bobcao3
Copy link
Collaborator

bobcao3 commented Sep 19, 2022

/rebase

@taichi-gardener
Copy link
Contributor

Rebase failed, please resolve the conflicts manually.

@Morcki
Copy link
Member Author

Morcki commented Sep 19, 2022

/rebase

May I merge this directly and solve the conflicts? It seems that rebase is a bit troublesome.

@ailzhang
Copy link
Contributor

@Morcki you can resolve merge conflict locally and the force push into this branch.

… backends when copying to vulkan backend

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Cpu backend is with LLVM and add annotation for memcpy_cpu_to_vulkan

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

fix a bug when transforms is None, instance count must be 1

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

fix a small bug

change ssbo to device-local memory

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
Copy link
Collaborator

@bobcao3 bobcao3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Morcki Morcki merged commit 1262a70 into taichi-dev:master Sep 20, 2022
@Morcki Morcki deleted the taichi_fix_bug branch September 20, 2022 01:22
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.

5 participants