blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 746 Projects 19 Wiki Activity

Mesh: Replace auto smooth with node group #108014

Merged
Hans Goudey merged 149 commits from HooglyBoogly/blender:refactor-mesh-corner-normals-lazy into main 2023-10-20 16:54:20 +02:00
Conversation 15 Commits 149 Files Changed 98 +82 -26
3 changed files with 82 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8eabeb1557 - Show all commits

15
source/blender/editors/interface/interface_button_sections.cc
View File

@ -93,8 +93,13 @@ static Vector<rcti> button_section_bounds_calc(const ARegion *region, const bool
if (add_padding) {
const uiStyle *style = UI_style_get_dpi();
const int pad_x = style->buttonspacex;
/* Making this based on the header size since this feature is typically used in headers, and
* this way we are more likely to pad the bounds all the way to the region edge. */
const int pad_y = ceil((HEADER_PADDING_Y * UI_SCALE_FAC) / 2.0f);
for (rcti &bounds : section_bounds) {
BLI_rcti_pad(&bounds, style->buttonspacex, style->buttonspacey);
BLI_rcti_pad(&bounds, pad_x, pad_y);
/* Clamp, important for the rounded-corners to draw correct. */
CLAMP_MIN(bounds.xmin, 0);
CLAMP_MAX(bounds.xmax, region->winx);
@ -138,6 +143,14 @@ static void ui_draw_button_sections_background(const ARegion *region,
rctf bounds_float;
BLI_rctf_rcti_copy(&bounds_float, &bounds);
/* Make space for the separator line. */
if (align == uiButtonSectionsAlign::Top) {
bounds_float.ymax -= UI_BUTTON_SECTION_SEPERATOR_LINE_WITH;
}
else if (align == uiButtonSectionsAlign::Bottom) {
bounds_float.ymin += UI_BUTTON_SECTION_SEPERATOR_LINE_WITH;
}
UI_draw_roundbox_corner_set(roundbox_corners);
UI_draw_roundbox_4fv(&bounds_float, true, corner_radius, bg_color);
}

8
source/blender/gpu/metal/mtl_context.mm
View File

@ -2190,7 +2190,7 @@ void MTLContext::compute_dispatch(int groups_x_len, int groups_y_len, int groups
}
#if MTL_DEBUG_SINGLE_DISPATCH_PER_ENCODER == 1
GPU_finish();
GPU_flush();
#endif
/* Shader instance. */
@ -2225,7 +2225,7 @@ void MTLContext::compute_dispatch(int groups_x_len, int groups_y_len, int groups
compute_pso_inst.threadgroup_y_len,
compute_pso_inst.threadgroup_z_len)];
#if MTL_DEBUG_SINGLE_DISPATCH_PER_ENCODER == 1
GPU_finish();
GPU_flush();
#endif
}
@ -2233,7 +2233,7 @@ void MTLContext::compute_dispatch_indirect(StorageBuf *indirect_buf)
{
#if MTL_DEBUG_SINGLE_DISPATCH_PER_ENCODER == 1
GPU_finish();
GPU_flush();
#endif
/* Ensure all resources required by upcoming compute submission are correctly bound. */
@ -2279,7 +2279,7 @@ void MTLContext::compute_dispatch_indirect(StorageBuf *indirect_buf)
compute_pso_inst.threadgroup_y_len,
compute_pso_inst.threadgroup_z_len)];
#if MTL_DEBUG_SINGLE_DISPATCH_PER_ENCODER == 1
GPU_finish();
GPU_flush();
#endif
}
}

85
source/blender/gpu/metal/mtl_storage_buffer.mm
View File

@ -107,7 +107,8 @@ void MTLStorageBuf::init()
BLI_assert(ctx->device);
UNUSED_VARS_NDEBUG(ctx);
metal_buffer_ = MTLContext::get_global_memory_manager()->allocate(size_in_bytes_, true);
metal_buffer_ = MTLContext::get_global_memory_manager()->allocate(
size_in_bytes_, (usage_ == GPU_USAGE_DEVICE_ONLY) ? false : true);
#ifndef NDEBUG
metal_buffer_->set_label([NSString stringWithFormat:@"Storage Buffer %s", name_]);
@ -125,20 +126,62 @@ void MTLStorageBuf::update(const void *data)
return;
}
/* For device-only Storage buffers, update private resource via staging buffer in command
* stream. */
bool device_only = (usage_ == GPU_USAGE_DEVICE_ONLY);
bool do_upload_data = (data != nullptr);
/* If host-visible, upload data to new buffer, as previous data may still be in-use by executing
* GPU commands. */
if (!device_only && do_upload_data) {
if (metal_buffer_ != nullptr) {
metal_buffer_->free();
metal_buffer_ = nullptr;
}
}
/* Ensure buffer has been allocated. */
if (metal_buffer_ == nullptr) {
init();
}
BLI_assert(data != nullptr);
if (data != nullptr) {
/* Upload data. */
BLI_assert(data != nullptr);
BLI_assert(!(metal_buffer_->get_resource_options() & MTLResourceStorageModePrivate));
BLI_assert(size_in_bytes_ <= metal_buffer_->get_size());
BLI_assert(size_in_bytes_ <= [metal_buffer_->get_metal_buffer() length]);
memcpy(metal_buffer_->get_host_ptr(), data, size_in_bytes_);
metal_buffer_->flush_range(0, size_in_bytes_);
BLI_assert(do_upload_data);
if (do_upload_data) {
if (device_only) {
/* Fetch active context. */
MTLContext *ctx = static_cast<MTLContext *>(unwrap(GPU_context_active_get()));
BLI_assert(ctx);
/* Prepare staging buffer. */
gpu::MTLBuffer *staging_buf = MTLContext::get_global_memory_manager()->allocate(
size_in_bytes_, true);
memcpy(staging_buf->get_host_ptr(), data, size_in_bytes_);
staging_buf->flush_range(0, size_in_bytes_);
id<MTLBuffer> staging_buf_mtl = staging_buf->get_metal_buffer();
BLI_assert(staging_buf_mtl != nil);
/* Ensure destination buffer. */
id<MTLBuffer> dst_buf = this->metal_buffer_->get_metal_buffer();
BLI_assert(dst_buf != nil);
id<MTLBlitCommandEncoder> blit_encoder =
ctx->main_command_buffer.ensure_begin_blit_encoder();
[blit_encoder copyFromBuffer:staging_buf_mtl
sourceOffset:0
toBuffer:dst_buf
destinationOffset:0
size:size_in_bytes_];
}
else {
/* Upload data. */
BLI_assert(data != nullptr);
BLI_assert(!(metal_buffer_->get_resource_options() & MTLResourceStorageModePrivate));
BLI_assert(size_in_bytes_ <= metal_buffer_->get_size());
BLI_assert(size_in_bytes_ <= [metal_buffer_->get_metal_buffer() length]);
memcpy(metal_buffer_->get_host_ptr(), data, size_in_bytes_);
metal_buffer_->flush_range(0, size_in_bytes_);
}
has_data_ = true;
}
}
@ -298,9 +341,6 @@ void MTLStorageBuf::read(void *data)
[blit_encoder synchronizeResource:metal_buffer_->get_metal_buffer()];
}
/* Ensure sync has occurred. */
GPU_finish();
/* Read data. NOTE: Unless explicitly synchronized with GPU work, results may not be ready. */
memcpy(data, metal_buffer_->get_host_ptr(), size_in_bytes_);
}
@ -312,14 +352,17 @@ id<MTLBuffer> MTLStorageBuf::get_metal_buffer()
switch (storage_source_) {
/* Default SSBO buffer comes from own allocation. */
case MTL_STORAGE_BUF_TYPE_DEFAULT: {
if (metal_buffer_ == nullptr) {
this->init();
}
if (data_ != nullptr) {
this->update(data_);
MEM_SAFE_FREE(data_);
}
/* NOTE: We should always ensure that the data is primed prior to requiring fetching of the
* buffer. If get_metal_buffer is called during a resource bind phase, invoking a blit
* command encoder to upload data would override the active encoder state being prepared.
* Resource generation and data upload should happen earlier as a resource is bound. */
BLI_assert_msg(metal_buffer_ != nullptr,
"Storage Buffer backing resource does not yet exist. Ensure the resource is "
"bound with data before the calling code requires its underlying MTLBuffer.");
BLI_assert_msg(
data_ == nullptr,
"Storage Buffer backing resource data has not yet been uploaded. Ensure the resource is "
"bound with data before the calling code requires its underlying MTLBuffer.");
source_buffer = metal_buffer_;
} break;
/* SSBO buffer comes from Uniform Buffer. */