blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Fix #104370: Draw: Don't request the same attribute more than once #104709

Merged
Miguel Pozo merged 2 commits from pragma37/blender:pull-fix-104370 into blender-v3.5-release 2023-02-15 23:55:02 +01:00
Conversation 2 Commits 2 Files Changed 2 +19 -24
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/draw/intern/draw_attributes.cc
View File

@ -4,20 +4,15 @@
#include "draw_attributes.hh"
/* Return true if the given DRW_AttributeRequest is already in the requests. */
static bool drw_attributes_has_request(const DRW_Attributes *requests, DRW_AttributeRequest req)
static bool drw_attributes_has_request(const DRW_Attributes *requests,
const DRW_AttributeRequest &req)
{
for (int i = 0; i < requests->num_requests; i++) {
const DRW_AttributeRequest src_req = requests->requests[i];
if (src_req.domain != req.domain) {
continue;
const DRW_AttributeRequest &src_req = requests->requests[i];
if (src_req.domain == req.domain && src_req.layer_index == req.layer_index &&
src_req.cd_type == req.cd_type) {
return true;
}
if (src_req.layer_index != req.layer_index) {
continue;
}
if (src_req.cd_type != req.cd_type) {
continue;
}
return true;
}
return false;
}
@ -61,14 +56,15 @@ bool drw_attributes_overlap(const DRW_Attributes *a, const DRW_Attributes *b)
return true;
}
DRW_AttributeRequest *drw_attributes_add_request(DRW_Attributes *attrs,
const char *name,
const eCustomDataType type,
const int layer_index,
const eAttrDomain domain)
void drw_attributes_add_request(DRW_Attributes *attrs,
const char *name,
const eCustomDataType type,
const int layer_index,
const eAttrDomain domain)
{
if (attrs->num_requests >= GPU_MAX_ATTR) {
return nullptr;
if (attrs->num_requests >= GPU_MAX_ATTR ||
drw_attributes_has_request(attrs, {type, layer_index, domain})) {
return;
}
DRW_AttributeRequest *req = &attrs->requests[attrs->num_requests];
@ -77,7 +73,6 @@ DRW_AttributeRequest *drw_attributes_add_request(DRW_Attributes *attrs,
req->layer_index = layer_index;
req->domain = domain;
pragma37 marked this conversation as resolved
Hans Goudey commented 2023-02-13 18:32:11 +01:00
Review
Copy Link

Hmm, seems like this logic should be deduplicated with drw_attributes_has_request, which is basically the same except it returns a boolean.

Hmm, seems like this logic should be deduplicated with `drw_attributes_has_request`, which is basically the same except it returns a boolean.
Miguel Pozo commented 2023-02-13 19:35:31 +01:00
Review
Copy Link

The DRW_Attributes parameter in drw_attributes_has_request is const, but drw_attributes_add_request returns a non-const one.

There's not a single call to drw_attributes_add_request that actually uses the return value, though, so we could simply remove it or return a const result.

The `DRW_Attributes` parameter in `drw_attributes_has_request` is const, but `drw_attributes_add_request` returns a non-const one. There's not a single call to `drw_attributes_add_request` that actually uses the return value, though, so we could simply remove it or return a const result.
attrs->num_requests += 1;
return req;
}
bool drw_custom_data_match_attribute(const CustomData *custom_data,

10
source/blender/draw/intern/draw_attributes.hh
View File

@ -60,11 +60,11 @@ void drw_attributes_merge(DRW_Attributes *dst,
/* Return true if all requests in b are in a. */
bool drw_attributes_overlap(const DRW_Attributes *a, const DRW_Attributes *b);
DRW_AttributeRequest *drw_attributes_add_request(DRW_Attributes *attrs,
const char *name,
eCustomDataType data_type,
int layer_index,
eAttrDomain domain);
void drw_attributes_add_request(DRW_Attributes *attrs,
const char *name,
eCustomDataType data_type,
int layer_index,
eAttrDomain domain);
bool drw_custom_data_match_attribute(const CustomData *custom_data,
const char *name,