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

OpenGL external array access (stage 2.1.2) #586

Merged
merged 2 commits into from
Mar 14, 2020

Conversation

archibate
Copy link
Collaborator

Related issue id = #492

@archibate
Copy link
Collaborator Author

Sleepy now Zzz... enjoy code reviewing :)

@archibate
Copy link
Collaborator Author

Hello?

@archibate archibate changed the title OpenGL range for & external array access (stage 2.1) OpenGL external array access (stage 2.1.2) Mar 14, 2020
@archibate
Copy link
Collaborator Author

I rebased this PR to #594. Please merge that before merge this.

@archibate
Copy link
Collaborator Author

Should we merge into taichi-dev:opengl instead of taichi-dev:master for not rushing the v6.0 release?

 Conflicts:
	taichi/codegen/codegen_opengl.cpp
	taichi/platform/opengl/opengl_kernel.cpp
	taichi/platform/opengl/opengl_kernel.h
@yuanming-hu
Copy link
Member

Should we merge into taichi-dev:opengl instead of taichi-dev:master for not rushing the v6.0 release?

We have plenty of time before we release v0.6. Only merging into taichi-dev:opengl might lead to other issues when merging opengl into master. Let's directly make these parts of the master branch.

@yuanming-hu yuanming-hu merged commit b8d11b2 into taichi-dev:master Mar 14, 2020
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.

2 participants