blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Compositor: Switch CPU compositor to Full-Frame #118010

Merged
Omar Emara merged 3 commits from Sergey/blender:compositor_fullframe_default into main 2024-02-14 14:24:00 +01:00
Conversation 2 Commits 3 Files Changed 14 +7 -68
7 changed files with 7 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da018510bb - Show all commits

1
scripts/startup/bl_ui/space_node.py
View File

@ -818,7 +818,6 @@ class NODE_PT_quality(bpy.types.Panel):
col.active = not use_realtime
col.prop(tree, "render_quality", text="Render")
col.prop(tree, "edit_quality", text="Edit")
col.prop(tree, "chunk_size")
col = layout.column()
col.active = not use_realtime

8
source/blender/blenloader/intern/versioning_260.cc
View File

@ -1733,14 +1733,6 @@ void blo_do_versions_260(FileData *fd, Library * /*lib*/, Main *bmain)
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 263, 10)) {
{
/* composite redesign */
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
if (scene->nodetree) {
if (scene->nodetree->chunksize == 0) {
scene->nodetree->chunksize = 256;
}
}
}
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ntree->type == NTREE_COMPOSIT) {
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {

7
source/blender/blenloader/intern/versioning_400.cc
View File

@ -2932,13 +2932,18 @@ void blo_do_versions_400(FileData *fd, Library * /*lib*/, Main *bmain)
constexpr int NTREE_COM_GROUPNODE_BUFFER = 1 << 3;
constexpr int NTREE_COM_OPENCL = 1 << 1;
LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ntree->type != NTREE_COMPOSIT) {
continue;
}
ntree->flag &= ~(NTREE_COM_GROUPNODE_BUFFER | NTREE_COM_OPENCL);
if (ntree->execution_mode == NTREE_EXECUTION_MODE_FULL_FRAME) {
ntree->execution_mode = NTREE_EXECUTION_MODE_CPU;
}
}
FOREACH_NODETREE_END;
}
/**

2
source/blender/compositor/intern/COM_CompositorContext.h
View File

@ -236,7 +236,7 @@ class CompositorContext {
int get_chunksize() const
{
return this->get_bnodetree()->chunksize;
return 256;
}
void set_fast_calculation(bool fast_calculation)

1
source/blender/editors/space_node/node_edit.cc
View File

@ -639,7 +639,6 @@ void ED_node_composit_default(const bContext *C, Scene *sce)
sce->nodetree = blender::bke::ntreeAddTreeEmbedded(
nullptr, &sce->id, "Compositing Nodetree", ntreeType_Composite->idname);
sce->nodetree->chunksize = 256;
sce->nodetree->edit_quality = NTREE_QUALITY_HIGH;
sce->nodetree->render_quality = NTREE_QUALITY_HIGH;

14
source/blender/makesdna/DNA_node_types.h
View File

@ -618,16 +618,6 @@ enum {
NTREE_QUALITY_LOW = 2,
};
/** #bNodeTree::chunksize */
enum {
NTREE_CHUNKSIZE_32 = 32,
NTREE_CHUNKSIZE_64 = 64,
NTREE_CHUNKSIZE_128 = 128,
NTREE_CHUNKSIZE_256 = 256,
NTREE_CHUNKSIZE_512 = 512,
NTREE_CHUNKSIZE_1024 = 1024,
};
typedef struct bNestedNodePath {
/** ID of the node that is or contains the nested node. */
int32_t node_id;
@ -688,15 +678,11 @@ typedef struct bNodeTree {
short edit_quality;
/** Quality setting when rendering. */
short render_quality;
/** Tile size for compositor engine. */
int chunksize;
/** Execution mode to use for compositor engine. */
int execution_mode;
/** Execution mode to use for compositor engine. */
int precision;
char _pad[4];
rctf viewer_border;
/**

42
source/blender/makesrna/intern/rna_nodetree.cc
View File

@ -96,40 +96,6 @@ static const EnumPropertyItem node_quality_items[] = {
{NTREE_QUALITY_LOW, "LOW", 0, "Low", "Low quality"},
{0, nullptr, 0, nullptr, nullptr},
};
static const EnumPropertyItem node_chunksize_items[] = {
{NTREE_CHUNKSIZE_32,
"32",
0,
"32" BLI_STR_UTF8_MULTIPLICATION_SIGN "32",
"Chunksize of 32" BLI_STR_UTF8_MULTIPLICATION_SIGN "32"},
{NTREE_CHUNKSIZE_64,
"64",
0,
"64" BLI_STR_UTF8_MULTIPLICATION_SIGN "64",
"Chunksize of 64" BLI_STR_UTF8_MULTIPLICATION_SIGN "64"},
{NTREE_CHUNKSIZE_128,
"128",
0,
"128" BLI_STR_UTF8_MULTIPLICATION_SIGN "128",
"Chunksize of 128" BLI_STR_UTF8_MULTIPLICATION_SIGN "128"},
{NTREE_CHUNKSIZE_256,
"256",
0,
"256" BLI_STR_UTF8_MULTIPLICATION_SIGN "256",
"Chunksize of 256" BLI_STR_UTF8_MULTIPLICATION_SIGN "256"},
{NTREE_CHUNKSIZE_512,
"512",
0,
"512" BLI_STR_UTF8_MULTIPLICATION_SIGN "512",
"Chunksize of 512" BLI_STR_UTF8_MULTIPLICATION_SIGN "512"},
{NTREE_CHUNKSIZE_1024,
"1024",
0,
"1024" BLI_STR_UTF8_MULTIPLICATION_SIGN "1024",
"Chunksize of 1024" BLI_STR_UTF8_MULTIPLICATION_SIGN "1024"},
{0, nullptr, 0, nullptr, nullptr},
};
#endif
static const EnumPropertyItem rna_enum_execution_mode_items[] = {
@ -10597,14 +10563,6 @@ static void rna_def_composite_nodetree(BlenderRNA *brna)
RNA_def_property_enum_items(prop, node_quality_items);
RNA_def_property_ui_text(prop, "Edit Quality", "Quality when editing");
prop = RNA_def_property(srna, "chunk_size", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, nullptr, "chunksize");
RNA_def_property_enum_items(prop, node_chunksize_items);
RNA_def_property_ui_text(prop,
"Chunksize",
"Max size of a tile (smaller values gives better distribution "
"of multiple threads, but more overhead)");
prop = RNA_def_property(srna, "use_two_pass", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", NTREE_TWO_PASS);
RNA_def_property_ui_text(prop,