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.

Sign up for GitHub

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

[GUI] [mac] Support fast_gui on macOS #1981

Merged
merged 2 commits into from
Oct 23, 2020
Merged

[GUI] [mac] Support fast_gui on macOS #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e408ca
[GUI] [mac] Support fast_gui on macOS
k-ye Oct 21, 2020
456b7ef
address comments
k-ye Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions python/taichi/lang/meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,20 @@ def tensor_to_ext_arr(tensor: ti.template(), arr: ti.ext_arr()):
def vector_to_fast_image(img: ti.template(), out: ti.ext_arr()):
# FIXME: Why is ``for i, j in img:`` slower than:
for i, j in ti.ndrange(*img.shape):
u, v, w = min(255, max(0, int(img[i, img.shape[1] - 1 - j] * 255)))
r, g, b = min(255, max(0, int(img[i, img.shape[1] - 1 - j] * 255)))
idx = j * img.shape[0] + i
# We use i32 for |out| since OpenGL and Metal doesn't support u8 types
# TODO: treat Cocoa and Big-endian machines, with XOR logic
out[j * img.shape[0] + i] = w + (v << 8) + (u << 16)
if ti.static(ti.get_os_name() != 'osx'):
out[idx] = (r << 16) + (g << 8) + b
else:
# What's -16777216?
#
# On Mac, we need to set the alpha channel to 0xff. Since Mac's GUI
# is big-endian, the color is stored in ABGR order, and we need to
# add 0xff000000, which is -16777216 in I32's legit range. (Albeit
# the clarity, adding 0xff000000 doesn't work.)
alpha = -16777216
out[idx] = (b << 16) + (g << 8) + r + alpha


@ti.kernel
Expand Down
28 changes: 17 additions & 11 deletions taichi/gui/cocoa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,21 +194,27 @@ void updateLayer(id self, SEL _) {
using namespace taichi;
auto *gui = gui_from_id[self];
auto width = gui->width, height = gui->height;
auto &img = gui->canvas->img;
auto &data = gui->img_data;
for (int j = 0; j < height; j++) {
for (int i = 0; i < width; i++) {
int index = 4 * (i + j * width);
auto pixel = img[i][height - j - 1];
data[index++] = uint8(clamp(int(pixel[0] * 255.0_f), 0, 255));
data[index++] = uint8(clamp(int(pixel[1] * 255.0_f), 0, 255));
data[index++] = uint8(clamp(int(pixel[2] * 255.0_f), 0, 255));
data[index++] = 255; // alpha
uint8_t *data_ptr = nullptr;
if (gui->fast_gui) {
data_ptr = reinterpret_cast<uint8_t *>(gui->fast_buf);
} else {
auto &img = gui->canvas->img;
auto &data = gui->img_data;
data_ptr = data.data();
for (int j = 0; j < height; j++) {
for (int i = 0; i < width; i++) {
int index = 4 * (i + j * width);
auto pixel = img[i][height - j - 1];
data[index++] = uint8(clamp(int(pixel[0] * 255.0_f), 0, 255));
data[index++] = uint8(clamp(int(pixel[1] * 255.0_f), 0, 255));
data[index++] = uint8(clamp(int(pixel[2] * 255.0_f), 0, 255));
data[index++] = 255; // alpha
}
}
}

CGDataProviderRef provider = CGDataProviderCreateWithData(
nullptr, data.data(), gui->img_data_length, nullptr);
nullptr, data_ptr, gui->img_data_length, nullptr);
CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB();
CGImageRef image =
CGImageCreate(width, height, 8, 32, width * 4, colorspace,
Expand Down