[Bf-blender-cvs] [3dead138450] soc-2022-many-lights-sampling: Cleanup: unused members in light tree struct
Commit: 3dead13845057a417cf5c8d198bca9c366b3e4d1
Author: Jeffrey Liu
Date: Wed Jun 22 01:42:20 2022 -0400
Branches: soc-2022-many-lights-sampling
https://developer.blender.org/rB3dead13845057a417cf5c8d198bca9c366b3e4d1
Cleanup: unused members in light tree struct
===
M intern/cycles/kernel/types.h
M intern/cycles/scene/light.cpp
M release/scripts/addons
===
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h
index 5a5e1bcc220..474a6966ae5 100644
--- a/intern/cycles/kernel/types.h
+++ b/intern/cycles/kernel/types.h
@@ -1538,12 +1538,6 @@ typedef struct KernelLightTreeEmitter {
/* Energy. */
float energy;
-
- /* If this is positive, this is a triangle. Otherwise, it's a light source.
*/
- int prim_id;
-
- /* Padding. */
- int pad1, pad2, pad3;
} KernelLightTreeEmitter;
static_assert_align(KernelLightTreeEmitter, 16);
diff --git a/intern/cycles/scene/light.cpp b/intern/cycles/scene/light.cpp
index e46c76594f4..3035a2e3138 100644
--- a/intern/cycles/scene/light.cpp
+++ b/intern/cycles/scene/light.cpp
@@ -393,8 +393,6 @@ void LightManager::device_update_distribution(Device *,
}
light_tree_emitters[index].theta_o = bcone.theta_o;
light_tree_emitters[index].theta_e = bcone.theta_e;
-
- light_tree_emitters[index].prim_id = prim.prim_id;
}
dscene->light_tree_emitters.copy_to_device();
}
diff --git a/release/scripts/addons b/release/scripts/addons
index 5902265f1e5..038db9d607b 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5902265f1e5aaeca3781ea15f994bdf0b3cb054d
+Subproject commit 038db9d607b352f6a7391c5a6b3ab906692c9421
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [75f0aaab3d3] master: Cleanup: remove redundant GPU headers
Commit: 75f0aaab3d37f9eac61d5cea2b42b16adabff304
Author: Campbell Barton
Date: Wed Jun 22 14:59:42 2022 +1000
Branches: master
https://developer.blender.org/rB75f0aaab3d37f9eac61d5cea2b42b16adabff304
Cleanup: remove redundant GPU headers
===
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/intern/gpu_batch.cc
M source/blender/gpu/intern/gpu_batch_presets.c
M source/blender/gpu/intern/gpu_batch_utils.c
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_capabilities.cc
M source/blender/gpu/intern/gpu_codegen.cc
M source/blender/gpu/intern/gpu_compute.cc
M source/blender/gpu/intern/gpu_context.cc
M source/blender/gpu/intern/gpu_drawlist.cc
M source/blender/gpu/intern/gpu_framebuffer.cc
M source/blender/gpu/intern/gpu_immediate.cc
M source/blender/gpu/intern/gpu_immediate_util.c
M source/blender/gpu/intern/gpu_init_exit.c
M source/blender/gpu/intern/gpu_material.c
M source/blender/gpu/intern/gpu_select.c
M source/blender/gpu/intern/gpu_select_pick.c
M source/blender/gpu/intern/gpu_select_sample_query.cc
M source/blender/gpu/intern/gpu_shader_builtin.c
M source/blender/gpu/intern/gpu_shader_create_info.cc
M source/blender/gpu/intern/gpu_shader_dependency.cc
M source/blender/gpu/intern/gpu_shader_log.cc
M source/blender/gpu/intern/gpu_state.cc
M source/blender/gpu/intern/gpu_storage_buffer.cc
M source/blender/gpu/intern/gpu_texture.cc
M source/blender/gpu/intern/gpu_vertex_buffer.cc
M source/blender/gpu/intern/gpu_viewport.c
M source/blender/gpu/opengl/gl_backend.cc
M source/blender/gpu/opengl/gl_batch.cc
M source/blender/gpu/opengl/gl_compute.cc
M source/blender/gpu/opengl/gl_context.cc
M source/blender/gpu/opengl/gl_debug_layer.cc
M source/blender/gpu/opengl/gl_drawlist.cc
M source/blender/gpu/opengl/gl_framebuffer.cc
M source/blender/gpu/opengl/gl_immediate.cc
M source/blender/gpu/opengl/gl_index_buffer.cc
M source/blender/gpu/opengl/gl_shader.cc
M source/blender/gpu/opengl/gl_shader_interface.cc
M source/blender/gpu/opengl/gl_state.cc
M source/blender/gpu/opengl/gl_storage_buffer.cc
M source/blender/gpu/opengl/gl_texture.cc
M source/blender/gpu/opengl/gl_uniform_buffer.cc
M source/blender/gpu/opengl/gl_vertex_array.cc
M source/blender/python/gpu/gpu_py_api.c
M source/blender/python/gpu/gpu_py_batch.c
M source/blender/python/gpu/gpu_py_element.c
M source/blender/python/gpu/gpu_py_offscreen.c
M source/blender/python/gpu/gpu_py_platform.c
M source/blender/python/gpu/gpu_py_select.c
M source/blender/python/gpu/gpu_py_shader.c
M source/blender/python/gpu/gpu_py_shader_create_info.cc
M source/blender/python/gpu/gpu_py_types.c
M source/blender/python/gpu/gpu_py_uniformbuffer.c
M source/blender/python/gpu/gpu_py_vertex_format.c
===
diff --git a/source/blender/gpu/CMakeLists.txt
b/source/blender/gpu/CMakeLists.txt
index faf68cf2197..cadc2c4445b 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -21,13 +21,12 @@ set(INC
../imbuf
../makesdna
../makesrna
- ../windowmanager
+ # For theme color access.
../editors/include
- # For node muting stuff...
+ # For node muting stuff.
../nodes
- ../nodes/intern
../../../intern/atomic
../../../intern/clog
diff --git a/source/blender/gpu/intern/gpu_batch.cc
b/source/blender/gpu/intern/gpu_batch.cc
index 32b117dac12..1b34b6e6c69 100644
--- a/source/blender/gpu/intern/gpu_batch.cc
+++ b/source/blender/gpu/intern/gpu_batch.cc
@@ -14,7 +14,6 @@
#include "GPU_batch.h"
#include "GPU_batch_presets.h"
-#include "GPU_matrix.h"
#include "GPU_platform.h"
#include "GPU_shader.h"
diff --git a/source/blender/gpu/intern/gpu_batch_presets.c
b/source/blender/gpu/intern/gpu_batch_presets.c
index ab5e23a846c..4dff35c3633 100644
--- a/source/blender/gpu/intern/gpu_batch_presets.c
+++ b/source/blender/gpu/intern/gpu_batch_presets.c
@@ -11,15 +11,8 @@
#include "BLI_utildefines.h"
#include "MEM_guardedalloc.h"
-#include "DNA_userdef_types.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-
#include "GPU_batch.h"
-#include "GPU_batch_presets.h" /* own include */
-#include "GPU_batch_utils.h"
-#include "GPU_context.h"
+#include "GPU_batch_presets.h" /* Own include. */
/* */
/** \name Local Structures
@@ -139,7 +132,7 @@ GPUBatch *GPU_batch_preset_sphere_wire(int lod)
/** \name Create Sphere (3D)
* \{ */
-GPUBatch *gpu_batch_sphere(int lat_res, int lon_res)
+static GPUBatch *gpu_batch_sphere(int lat_res, int lon_res)
{
const float lon_inc = 2 * M_PI / l
[Bf-blender-cvs] [b8289eb1b9c] master: Cleanup: replace BLF defines with enum, formatting
Commit: b8289eb1b9c63a25a1926a32740171a92d857b2b
Author: Campbell Barton
Date: Wed Jun 22 14:50:22 2022 +1000
Branches: master
https://developer.blender.org/rBb8289eb1b9c63a25a1926a32740171a92d857b2b
Cleanup: replace BLF defines with enum, formatting
===
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M source/blender/blenfont/BLF_api.h
M source/blender/blenfont/intern/blf_font.c
===
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 1239f49473c..623ca2340d1 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5590,6 +5590,7 @@ def km_font(params):
return keymap
+
# Curves edit mode.
def km_curves(params):
items = []
diff --git a/source/blender/blenfont/BLF_api.h
b/source/blender/blenfont/BLF_api.h
index 78c8612f7f5..83ca9158efc 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -329,23 +329,29 @@ void BLF_load_font_stack(void);
void BLF_state_print(int fontid);
#endif
-/* font->flags. */
-#define BLF_ROTATION (1 << 0)
-#define BLF_CLIPPING (1 << 1)
-#define BLF_SHADOW (1 << 2)
-// #define BLF_FLAG_UNUSED_3 (1 << 3) /* dirty */
-#define BLF_MATRIX (1 << 4)
-#define BLF_ASPECT (1 << 5)
-#define BLF_WORD_WRAP (1 << 6)
-#define BLF_MONOCHROME (1 << 7) /* no-AA */
-#define BLF_HINTING_NONE (1 << 8)
-#define BLF_HINTING_SLIGHT (1 << 9)
-#define BLF_HINTING_FULL (1 << 10)
-#define BLF_BOLD (1 << 11)
-#define BLF_ITALIC (1 << 12)
-#define BLF_MONOSPACED (1 << 13) /* Intended USE is monospaced, regardless of
font type. */
-#define BLF_DEFAULT (1 << 14) /* A font within the default stack of fonts. */
-#define BLF_LAST_RESORT (1 << 15) /* Must only be used as last font in the
stack. */
+/** #FontBLF.flags. */
+enum {
+ BLF_ROTATION = 1 << 0,
+ BLF_CLIPPING = 1 << 1,
+ BLF_SHADOW = 1 << 2,
+ // BLF_FLAG_UNUSED_3 = 1 << 3, /* dirty */
+ BLF_MATRIX = 1 << 4,
+ BLF_ASPECT = 1 << 5,
+ BLF_WORD_WRAP = 1 << 6,
+ /** No anti-aliasing. */
+ BLF_MONOCHROME = 1 << 7,
+ BLF_HINTING_NONE = 1 << 8,
+ BLF_HINTING_SLIGHT = 1 << 9,
+ BLF_HINTING_FULL = 1 << 10,
+ BLF_BOLD = 1 << 11,
+ BLF_ITALIC = 1 << 12,
+ /** Intended USE is monospaced, regardless of font type. */
+ BLF_MONOSPACED = 1 << 13,
+ /** A font within the default stack of fonts. */
+ BLF_DEFAULT = 1 << 14,
+ /** Must only be used as last font in the stack. */
+ BLF_LAST_RESORT = 1 << 15,
+};
#define BLF_DRAW_STR_DUMMY_MAX 1024
diff --git a/source/blender/blenfont/intern/blf_font.c
b/source/blender/blenfont/intern/blf_font.c
index 26a72fcb95a..3e2927d581e 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -1289,7 +1289,7 @@ FontBLF *blf_font_new(const char *name, const char
*filepath)
font->filepath = BLI_strdup(filepath);
blf_font_fill(font);
-/* Save TrueType table with bits to quickly test most unicode block
coverage. */
+ /* Save TrueType table with bits to quickly test most unicode block
coverage. */
TT_OS2 *os2_table = (TT_OS2 *)FT_Get_Sfnt_Table(font->face, FT_SFNT_OS2);
if (os2_table) {
font->UnicodeRanges[0] = (uint)os2_table->ulUnicodeRange1;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [8fab5809493] master: Fix T99078: Crash closing the file selector in Wayland
Commit: 8fab580949374e6208cee2e9ba2caf249bc0c1fd Author: Campbell Barton Date: Wed Jun 22 13:08:55 2022 +1000 Branches: master https://developer.blender.org/rB8fab580949374e6208cee2e9ba2caf249bc0c1fd Fix T99078: Crash closing the file selector in Wayland Ensure wayland handlers run that clear the window immediately after the window has been removed so dangling pointers to the window aren't left set. === M intern/ghost/intern/GHOST_WindowWayland.cpp === diff --git a/intern/ghost/intern/GHOST_WindowWayland.cpp b/intern/ghost/intern/GHOST_WindowWayland.cpp index 941e08ff035..01dd9721f2b 100644 --- a/intern/ghost/intern/GHOST_WindowWayland.cpp +++ b/intern/ghost/intern/GHOST_WindowWayland.cpp @@ -586,6 +586,20 @@ GHOST_WindowWayland::~GHOST_WindowWayland() xdg_surface_destroy(w->xdg_surface); wl_surface_destroy(w->wl_surface); + /* NOTE(@campbellbarton): This is needed so the appropriate handlers event + * (#wl_surface_listener.leave in particular) run to prevent access to the freed surfaces. + * Without this round-trip, calling #getCursorPosition immediately after closing a window + * causes dangling #wl_surface pointers to be accessed + * (since the window is used for scaling the cursor position). + * + * An alternative solution would be to clear all internal pointers that reference this window. + * Even though this is reasonable it introduces a 3rd state that needs to be accounted for, + * where values are cleared before they have been set to their new values. + * Any information requested in this state (such as the cursor position) won't be valid and + * could cause difficult to reproduce bugs. So perform a round-trip as closing a window isn't + * an action that runs continuously & isn't likely to cause unnecessary overhead. See: T99078. */ + wl_display_roundtrip(m_system->display()); + delete w; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c08fda3a6b1] master: Cleanup: Grammar in comments
Commit: c08fda3a6b1d05b5af76997436260fe881ff74c2
Author: Hans Goudey
Date: Tue Jun 21 15:47:25 2022 -0500
Branches: master
https://developer.blender.org/rBc08fda3a6b1d05b5af76997436260fe881ff74c2
Cleanup: Grammar in comments
===
M source/blender/blenlib/BLI_color.hh
===
diff --git a/source/blender/blenlib/BLI_color.hh
b/source/blender/blenlib/BLI_color.hh
index 98fd7d0f15d..b1b9aeb17f1 100644
--- a/source/blender/blenlib/BLI_color.hh
+++ b/source/blender/blenlib/BLI_color.hh
@@ -79,7 +79,7 @@ enum class eSpace {
};
std::ostream &operator<<(std::ostream &stream, const eSpace &space);
-/** Template class to store RGBA values with different precision, space and
alpha association. */
+/** Template class to store RGBA values with different precision, space, and
alpha association. */
template class
ColorRGBA {
public:
ChannelStorageType r, g, b, a;
@@ -167,7 +167,7 @@ class ColorSceneLinear4f final : public ColorRGBA encode() const
{
@@ -179,7 +179,7 @@ class ColorSceneLinear4f final : public ColorRGBA premultiply_alpha() const
{
@@ -196,7 +196,7 @@ class ColorSceneLinear4f final : public ColorRGBA unpremultiply_alpha() const
{
@@ -228,7 +228,7 @@ class ColorSceneLinearByteEncoded4b final
}
/**
- * Convert to back to float color.
+ * Convert to a float color.
*/
ColorSceneLinear4f decode() const
{
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [d901f8b75bf] master: Fix T98960: Baking to active color attribute uses wrong layer
Commit: d901f8b75bf83160a962c21566cf29f2f87df8c6
Author: Hans Goudey
Date: Tue Jun 21 14:15:18 2022 -0500
Branches: master
https://developer.blender.org/rBd901f8b75bf83160a962c21566cf29f2f87df8c6
Fix T98960: Baking to active color attribute uses wrong layer
Baking assumed that color attributes could only have two configurations:
float color data type on vertices, or byte color type on face corners.
In reality the options can be combined to make four total options.
This commit handles the four cases explicitly with a somewhat
more scaleable approach (though this should really be C++ code).
This commit also changes some related error messages, tooltips,
and an enum name, in order to make the functionality more obvious.
Differential Revision: https://developer.blender.org/D15244
===
M source/blender/editors/object/object_bake_api.c
M source/blender/makesrna/intern/rna_scene.c
===
diff --git a/source/blender/editors/object/object_bake_api.c
b/source/blender/editors/object/object_bake_api.c
index 006379123f8..58daf753679 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -21,6 +21,7 @@
#include "BLI_path_util.h"
#include "BLI_string.h"
+#include "BKE_attribute.h"
#include "BKE_callbacks.h"
#include "BKE_context.h"
#include "BKE_global.h"
@@ -447,14 +448,11 @@ static bool bake_object_check(ViewLayer *view_layer,
}
if (target == R_BAKE_TARGET_VERTEX_COLORS) {
-const MPropCol *mcol = CustomData_get_layer(&me->vdata, CD_PROP_COLOR);
-const bool mcol_valid = (mcol != NULL);
-const MLoopCol *mloopcol = CustomData_get_layer(&me->ldata,
CD_PROP_BYTE_COLOR);
-if (mloopcol == NULL && !mcol_valid) {
+if (BKE_id_attributes_active_color_get(&me->id) == NULL) {
BKE_reportf(reports,
RPT_ERROR,
- "No vertex colors layer found in the object \"%s\"",
- ob->id.name + 2);
+ "Mesh does not have an active color attribute \"%s\"",
+ me->id.name + 2);
return false;
}
}
@@ -938,17 +936,13 @@ static bool bake_targets_output_external(const
BakeAPIRender *bkr,
static bool bake_targets_init_vertex_colors(BakeTargets *targets, Object *ob,
ReportList *reports)
{
if (ob->type != OB_MESH) {
-BKE_report(
-reports, RPT_ERROR, "Vertex color baking not support with object types
other than mesh");
+BKE_report(reports, RPT_ERROR, "Color attribute baking is only supported
for mesh objects");
return false;
}
Mesh *me = ob->data;
- const MPropCol *mcol = CustomData_get_layer(&me->vdata, CD_PROP_COLOR);
- const bool mcol_valid = (mcol != NULL);
- const MLoopCol *mloopcol = CustomData_get_layer(&me->ldata,
CD_PROP_BYTE_COLOR);
- if (mloopcol == NULL && !mcol_valid) {
-BKE_report(reports, RPT_ERROR, "No vertex colors layer found to bake to");
+ if (BKE_id_attributes_active_color_get(&me->id) == NULL) {
+BKE_report(reports, RPT_ERROR, "No active color attribute to bake to");
return false;
}
@@ -997,10 +991,10 @@ static int find_original_loop(const Mesh *me_orig,
return ORIGINDEX_NONE;
}
-static void bake_targets_populate_pixels_vertex_colors(BakeTargets *targets,
- Object *ob,
- Mesh *me_eval,
- BakePixel *pixel_array)
+static void bake_targets_populate_pixels_color_attributes(BakeTargets *targets,
+ Object *ob,
+ Mesh *me_eval,
+ BakePixel
*pixel_array)
{
Mesh *me = ob->data;
const int pixels_num = targets->pixels_num;
@@ -1095,19 +1089,42 @@ static void bake_result_add_to_rgba(float rgba[4],
const float *result, const in
}
}
+static void convert_float_color_to_byte_color(const MPropCol *float_colors,
+ const int num,
+ const bool is_noncolor,
+ MLoopCol *byte_colors)
+{
+ if (is_noncolor) {
+for (int i = 0; i < num; i++) {
+ unit_float_to_uchar_clamp_v4(&byte_colors->r, float_colors[i].color);
+}
+ }
+ else {
+for (int i = 0; i < num; i++) {
+ linearrgb_to_srgb_uchar4(&byte_colors[i].r, float_colors[i].color);
+}
+ }
+}
+
static bool bake_targets_output_vertex_colors(BakeTargets *targets, Object *ob)
{
Mesh *me = ob->data;
- MPropCol *mcol = CustomData_get_layer(&me->vdata, CD_PROP_COLOR);
- const bool mcol_valid = (mcol != NULL);
- MLoopCol *mloopcol = CustomData_get_layer(&me->ldata, CD_PROP_BYTE_COLOR);
+ CustomDataL
[Bf-blender-cvs] [256cb68d33a] master: Cleanup: Remove unused argument
Commit: 256cb68d33aec68f2c3ae20a48a115046ba5ad0e
Author: Hans Goudey
Date: Tue Jun 21 14:17:24 2022 -0500
Branches: master
https://developer.blender.org/rB256cb68d33aec68f2c3ae20a48a115046ba5ad0e
Cleanup: Remove unused argument
===
M source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
M source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
===
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
index 51318331c76..aa38a4d6715 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
@@ -48,7 +48,7 @@ Object *MeshFromGeometry::create_mesh(Main *bmain,
obj->data = BKE_object_obdata_add_from_type(bmain, OB_MESH, ob_name.c_str());
create_vertices(mesh);
- create_polys_loops(obj, mesh, import_params.import_vertex_groups);
+ create_polys_loops(mesh, import_params.import_vertex_groups);
create_edges(mesh);
create_uv_verts(mesh);
create_normals(mesh);
@@ -167,7 +167,7 @@ void MeshFromGeometry::create_vertices(Mesh *mesh)
}
}
-void MeshFromGeometry::create_polys_loops(Object *obj, Mesh *mesh, bool
use_vertex_groups)
+void MeshFromGeometry::create_polys_loops(Mesh *mesh, bool use_vertex_groups)
{
mesh->dvert = nullptr;
const int64_t total_verts = mesh_geometry_.vertex_count_;
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
b/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
index c6773cfa0cb..591a7b81e63 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
@@ -47,7 +47,7 @@ class MeshFromGeometry : NonMovable, NonCopyable {
/**
* Create polygons for the Mesh, set smooth shading flags, Materials.
*/
- void create_polys_loops(Object *obj, Mesh *mesh, bool use_vertex_groups);
+ void create_polys_loops(Mesh *mesh, bool use_vertex_groups);
/**
* Add explicitly imported OBJ edges to the mesh.
*/
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [71400168388] master: GPencil: Move New Layer option to menu top
Commit: 714001683888770f9d870ba73edd65f4c2757bda
Author: Antonio Vazquez
Date: Tue Jun 21 16:38:58 2022 +0200
Branches: master
https://developer.blender.org/rB714001683888770f9d870ba73edd65f4c2757bda
GPencil: Move New Layer option to menu top
The new layer option must be the first in the menu.
Differential Revision: https://developer.blender.org/D15255
===
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M source/blender/editors/gpencil/gpencil_utils.c
===
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 8e5050be07e..8c43186313f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -234,6 +234,11 @@ class GPENCIL_MT_move_to_layer(Menu):
layout = self.layout
gpd = context.gpencil_data
if gpd:
+layout.operator_context = 'INVOKE_REGION_WIN'
+layout.operator("gpencil.move_to_layer", text="New Layer",
icon='ADD').layer = -1
+
+layout.separator()
+
gpl_active = context.active_gpencil_layer
tot_layers = len(gpd.layers)
i = tot_layers - 1
@@ -246,11 +251,6 @@ class GPENCIL_MT_move_to_layer(Menu):
layout.operator("gpencil.move_to_layer", text=gpl.info,
icon=icon, translate=False).layer = i
i -= 1
-layout.separator()
-
-layout.operator_context = 'INVOKE_REGION_WIN'
-layout.operator("gpencil.move_to_layer", text="New Layer",
icon='ADD').layer = -1
-
class GPENCIL_MT_layer_active(Menu):
bl_label = "Change Active Layer"
@@ -261,6 +261,10 @@ class GPENCIL_MT_layer_active(Menu):
gpd = context.gpencil_data
if gpd:
+layout.operator("gpencil.layer_add", text="New Layer", icon='ADD')
+
+layout.separator()
+
gpl_active = context.active_gpencil_layer
tot_layers = len(gpd.layers)
i = tot_layers - 1
@@ -273,10 +277,6 @@ class GPENCIL_MT_layer_active(Menu):
layout.operator("gpencil.layer_active", text=gpl.info,
icon=icon).layer = i
i -= 1
-layout.separator()
-
-layout.operator("gpencil.layer_add", text="New Layer", icon='ADD')
-
class GPENCIL_MT_material_active(Menu):
bl_label = "Change Active Material"
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index fc5b3838900..7b659511aaa 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -388,6 +388,17 @@ const EnumPropertyItem
*ED_gpencil_layers_with_new_enum_itemf(bContext *C,
/* Create new layer */
/* TODO: have some way of specifying that we don't want this? */
+ {
+/* "New Layer" entry */
+item_tmp.identifier = "__CREATE__";
+item_tmp.name = "New Layer";
+item_tmp.value = -1;
+item_tmp.icon = ICON_ADD;
+RNA_enum_item_add(&item, &totitem, &item_tmp);
+
+/* separator */
+RNA_enum_item_add_separator(&item, &totitem);
+ }
const int tot = BLI_listbase_count(&gpd->layers);
/* Existing layers */
@@ -405,17 +416,6 @@ const EnumPropertyItem
*ED_gpencil_layers_with_new_enum_itemf(bContext *C,
RNA_enum_item_add(&item, &totitem, &item_tmp);
}
- {
-/* separator */
-RNA_enum_item_add_separator(&item, &totitem);
-
-/* "New Layer" entry */
-item_tmp.identifier = "__CREATE__";
-item_tmp.name = "New Layer";
-item_tmp.value = -1;
-item_tmp.icon = ICON_ADD;
-RNA_enum_item_add(&item, &totitem, &item_tmp);
- }
RNA_enum_item_end(&item, &totitem);
*r_free = true;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [803cb750275] cycles_oneapi: Cleanup: deduplicate sycl compilation options
Commit: 803cb750275d867a1355f9526750d92a5e2551a7
Author: Xavier Hallade
Date: Tue Jun 21 16:31:49 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB803cb750275d867a1355f9526750d92a5e2551a7
Cleanup: deduplicate sycl compilation options
===
M intern/cycles/kernel/CMakeLists.txt
===
diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
index be10dc2e7d2..5d7ec2bdd19 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -764,10 +764,9 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
endforeach()
else()
# If AOT is disabled, build for spir64
-set (CYCLES_ONEAPI_GPU_COMPILATION_OPTIONS "-internal_options
'-ze-opt-large-register-file -ze-opt-regular-grf-kernel integrator_intersect'")
list(APPEND sycl_compiler_flags
-fsycl-targets=spir64
- -Xsycl-target-backend=spir64 "${CYCLES_ONEAPI_GPU_COMPILATION_OPTIONS}")
+ -Xsycl-target-backend=spir64 "${CYCLES_ONEAPI_SYCL_OPTIONS_spir64}")
endif()
if(WITH_NANOVDB)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [94f2eddf241] cycles_oneapi: Merge branch 'master' into cycles_oneapi
Commit: 94f2eddf24193b63a1ac9cd635be72873bf05bf9 Author: Sergey Sharybin Date: Tue Jun 21 16:08:19 2022 +0200 Branches: cycles_oneapi https://developer.blender.org/rB94f2eddf24193b63a1ac9cd635be72873bf05bf9 Merge branch 'master' into cycles_oneapi === === ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1000f870a95] temp-T99046-render-test-increase-fail-threshold: Increase render threshold for image test.
Commit: 1000f870a956d0cbdac509fe8905cad4365b90fd
Author: Jeroen Bakker
Date: Tue Jun 21 16:03:01 2022 +0200
Branches: temp-T99046-render-test-increase-fail-threshold
https://developer.blender.org/rB1000f870a956d0cbdac509fe8905cad4365b90fd
Increase render threshold for image test.
Makes the current test cases pass on NVIDIA 1080Ti/515.
===
M tests/python/eevee_render_tests.py
===
diff --git a/tests/python/eevee_render_tests.py
b/tests/python/eevee_render_tests.py
index 8c6f08ae76e..68895291044 100644
--- a/tests/python/eevee_render_tests.py
+++ b/tests/python/eevee_render_tests.py
@@ -7,6 +7,7 @@ import shlex
import shutil
import subprocess
import sys
+from pathlib import Path
def setup():
@@ -138,6 +139,11 @@ def main():
report.set_pixelated(True)
report.set_reference_dir("eevee_renders")
report.set_compare_engine('cycles', 'CPU')
+
+test_dir_name = Path(test_dir).name
+if test_dir_name.startswith('image'):
+report.set_fail_threshold(0.051)
+
ok = report.run(test_dir, blender, get_arguments, batch=True)
sys.exit(not ok)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9622dace3e2] master: Cleanup: removed unused Blender Internal bump/normal mapping texture code
Commit: 9622dace3e23a8eddaa0c443030120072a4a6482
Author: Brecht Van Lommel
Date: Mon Jun 20 17:10:27 2022 +0200
Branches: master
https://developer.blender.org/rB9622dace3e23a8eddaa0c443030120072a4a6482
Cleanup: removed unused Blender Internal bump/normal mapping texture code
The TexResult.nor output does not appear to be used anywhere.
===
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/makesdna/DNA_texture_types.h
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weightvg_util.c
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/nodes/texture/nodes/node_texture_output.c
M source/blender/nodes/texture/nodes/node_texture_proc.c
M source/blender/nodes/texture/nodes/node_texture_texture.c
M source/blender/render/RE_texture.h
M source/blender/render/intern/texture_image.c
M source/blender/render/intern/texture_procedural.c
===
diff --git a/source/blender/blenkernel/intern/effect.c
b/source/blender/blenkernel/intern/effect.c
index f2915a97746..7722c2fa004 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -868,8 +868,6 @@ static void do_texture_effector(EffectorCache *eff,
return;
}
- result[0].nor = result[1].nor = result[2].nor = result[3].nor = NULL;
-
strength = eff->pd->f_strength * efd->falloff;
copy_v3_v3(tex_co, point->loc);
diff --git a/source/blender/blenkernel/intern/fluid.c
b/source/blender/blenkernel/intern/fluid.c
index 06d32d5bfd4..5cd5a699dec 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -1942,7 +1942,6 @@ static void sample_mesh(FluidFlowSettings *ffs,
tex_co[1] = tex_co[1] * 2.0f - 1.0f;
tex_co[2] = ffs->texture_offset;
}
-texres.nor = NULL;
BKE_texture_get_value(NULL, ffs->noise_texture, tex_co, &texres,
false);
emission_strength *= texres.tin;
}
diff --git a/source/blender/makesdna/DNA_texture_types.h
b/source/blender/makesdna/DNA_texture_types.h
index b725939dbab..e32d9dbe300 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -397,8 +397,7 @@ typedef struct ColorMapping {
/* return value */
#define TEX_INT 0
-#define TEX_RGB (1 << 0)
-#define TEX_NOR (1 << 1)
+#define TEX_RGB 1
/* pr_texture in material, world, light. */
#define TEX_PR_TEXTURE 0
diff --git a/source/blender/modifiers/intern/MOD_displace.c
b/source/blender/modifiers/intern/MOD_displace.c
index 149cf0c0cbb..1e2224e3a65 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -197,7 +197,6 @@ static void displaceModifier_do_task(void *__restrict
userdata,
}
if (data->tex_target) {
-texres.nor = NULL;
BKE_texture_get_value_ex(
data->scene, data->tex_target, tex_co[iter], &texres, data->pool,
false);
delta = texres.tin - dmd->midlevel;
diff --git a/source/blender/modifiers/intern/MOD_warp.c
b/source/blender/modifiers/intern/MOD_warp.c
index 402d7b2c99e..9693cf0c0f2 100644
--- a/source/blender/modifiers/intern/MOD_warp.c
+++ b/source/blender/modifiers/intern/MOD_warp.c
@@ -302,7 +302,6 @@ static void warpModifier_do(WarpModifierData *wmd,
if (tex_co) {
struct Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
TexResult texres;
-texres.nor = NULL;
BKE_texture_get_value(scene, tex_target, tex_co[i], &texres, false);
fac *= texres.tin;
}
diff --git a/source/blender/modifiers/intern/MOD_wave.c
b/source/blender/modifiers/intern/MOD_wave.c
index 73b26dc29cd..4073f028db5 100644
--- a/source/blender/modifiers/intern/MOD_wave.c
+++ b/source/blender/modifiers/intern/MOD_wave.c
@@ -262,7 +262,6 @@ static void waveModifier_do(WaveModifierData *md,
if (tex_co) {
Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
TexResult texres;
- texres.nor = NULL;
BKE_texture_get_value(scene, tex_target, tex_co[i], &texres, false);
amplit *= texres.tin;
}
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c
b/source/blender/modifiers/intern/MOD_weightvg_util.c
index 65393370268..3302384568b 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.c
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.c
@@ -162,7 +162,6 @@ void weightvg_do_mask(const ModifierEvalContext *ctx,
do_color_manage = tex_use_channel != MOD_WVG_MASK_TEX_USE_INT;
- texres.nor = NULL;
BKE_texture_get_value(scene, texture, tex_co[idx], &t
[Bf-blender-cvs] [d2f47017b98] master: Fix crash editing anisotropic filter preference from background mode
Commit: d2f47017b984a50c2bf9ff355fb1d01865663d39
Author: Brecht Van Lommel
Date: Tue Jun 21 15:41:36 2022 +0200
Branches: master
https://developer.blender.org/rBd2f47017b984a50c2bf9ff355fb1d01865663d39
Fix crash editing anisotropic filter preference from background mode
===
M source/blender/gpu/intern/gpu_context.cc
M source/blender/gpu/intern/gpu_texture.cc
===
diff --git a/source/blender/gpu/intern/gpu_context.cc
b/source/blender/gpu/intern/gpu_context.cc
index c6eaf7defdc..b7dad589395 100644
--- a/source/blender/gpu/intern/gpu_context.cc
+++ b/source/blender/gpu/intern/gpu_context.cc
@@ -177,7 +177,7 @@ void GPU_render_step()
/** \name Backend selection
* \{ */
-static GPUBackend *g_backend;
+static GPUBackend *g_backend = nullptr;
bool GPU_backend_supported(eGPUBackendType type)
{
diff --git a/source/blender/gpu/intern/gpu_texture.cc
b/source/blender/gpu/intern/gpu_texture.cc
index d78dc845074..c300c0da3b2 100644
--- a/source/blender/gpu/intern/gpu_texture.cc
+++ b/source/blender/gpu/intern/gpu_texture.cc
@@ -702,7 +702,11 @@ void GPU_texture_get_mipmap_size(GPUTexture *tex, int lvl,
int *r_size)
void GPU_samplers_update()
{
- GPUBackend::get()->samplers_update();
+ /* Backend may not exist when we are updating preferences from background
mode. */
+ GPUBackend *backend = GPUBackend::get();
+ if (backend) {
+backend->samplers_update();
+ }
}
/** \} */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [d90b320444d] master: Fix T97533: Extrapolation of NLA strips outside current view are not rendered
Commit: d90b320444d5addf6dc5473dc0b94c975a2f9479
Author: Colin Basnett
Date: Tue Jun 21 14:43:19 2022 +0200
Branches: master
https://developer.blender.org/rBd90b320444d5addf6dc5473dc0b94c975a2f9479
Fix T97533: Extrapolation of NLA strips outside current view are not rendered
Do a more thorough search for strips that are not visible themselves,
but still influence the viewed time range.
The problem before was that tracks not immediately visible would not be
drawn at all. The strategy for fixing this was to simply include strips
that are visible only because of their extrapolation mode.
To do this, there is now a new function `get_visible_nla_strips` which
gives a first and last `NlaTrack` that needs to be drawn.
Tagging along with this is the removal of the strip index indicator from
the name on meta tracks. Because of the new structure of the code, it
would incur a performance penalty to restore the previous behavior
(requiring a linear search for the index). Since this number is of
virtually no utility to the user anyways (it has the look & feel of
developer debugging information), this is something I think we can
safely remove without regret.
Reviewed By: sybren
Differential Revision: https://developer.blender.org/D14738
===
M source/blender/editors/space_nla/nla_draw.c
===
diff --git a/source/blender/editors/space_nla/nla_draw.c
b/source/blender/editors/space_nla/nla_draw.c
index 6c631f46069..bb9e201d94a 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -621,7 +621,6 @@ static void nla_draw_strip(SpaceNla *snla,
static void nla_draw_strip_text(AnimData *adt,
NlaTrack *nlt,
NlaStrip *strip,
-int index,
View2D *v2d,
float xminc,
float xmaxc,
@@ -636,7 +635,7 @@ static void nla_draw_strip_text(AnimData *adt,
/* just print the name and the range */
if (strip->flag & NLASTRIP_FLAG_TEMP_META) {
-str_len = BLI_snprintf_rlen(str, sizeof(str), "%d) Temp-Meta", index);
+str_len = BLI_snprintf_rlen(str, sizeof(str), "Temp-Meta");
}
else {
str_len = BLI_strncpy_rlen(str, strip->name, sizeof(str));
@@ -702,6 +701,89 @@ static void nla_draw_strip_frames_text(
/* -- */
+/**
+ * Gets the first and last visible NLA strips on a track.
+ * Note that this also includes tracks that might only be
+ * visible because of their extendmode.
+ */
+static ListBase get_visible_nla_strips(NlaTrack *nlt, View2D *v2d)
+{
+ if (BLI_listbase_is_empty(&nlt->strips)) {
+ListBase empty = {NULL, NULL};
+return empty;
+ }
+
+ NlaStrip *first = NULL;
+ NlaStrip *last = NULL;
+
+ /* Find the first strip that is within the bounds of the view. */
+ LISTBASE_FOREACH (NlaStrip *, strip, &nlt->strips) {
+if (BKE_nlastrip_within_bounds(strip, v2d->cur.xmin, v2d->cur.xmax)) {
+ first = last = strip;
+ break;
+}
+ }
+
+ const bool has_strips_within_bounds = first != NULL;
+
+ if (has_strips_within_bounds) {
+/* Find the last visible strip. */
+for (NlaStrip *strip = first->next; strip; strip = strip->next) {
+ if (!BKE_nlastrip_within_bounds(strip, v2d->cur.xmin, v2d->cur.xmax)) {
+break;
+ }
+ last = strip;
+}
+/* Check if the first strip is adjacent to a strip outside the view to the
left
+ * that has an extendmode region that should be drawn.
+ * If so, adjust the first strip to include drawing that strip as well.
+ */
+NlaStrip *prev = first->prev;
+if (prev && prev->extendmode != NLASTRIP_EXTEND_NOTHING) {
+ first = prev;
+}
+ }
+ else {
+/* No immediately visible strips.
+ * Figure out where our view is relative to the strips, then determine
+ * if the view is adjacent to a strip that should have its extendmode
+ * rendered.
+ */
+NlaStrip *first_strip = nlt->strips.first;
+NlaStrip *last_strip = nlt->strips.last;
+if (first_strip && v2d->cur.xmax < first_strip->start &&
+first_strip->extendmode == NLASTRIP_EXTEND_HOLD) {
+ /* The view is to the left of all strips and the first strip has an
+ * extendmode that should be drawn.
+ */
+ first = last = first_strip;
+}
+else if (last_strip && v2d->cur.xmin > last_strip->end &&
+ last_strip->extendmode != NLASTRIP_EXTEND_NOTHING) {
+ /* The view is to the right of all strips and the last strip has an
+ * extendmode that should be drawn.
+ */
+ first = last = last_strip;
+}
+else {
+ /* The view is in the middle of two strips. */
+ LISTBASE_FOREACH (NlaStrip *, strip, &nlt->strips) {
+/* Find the strip to the left by fin
[Bf-blender-cvs] [e2c345c9a65] cycles_oneapi: Build Deps: Bump DPC++ version to sycl-nightly/20220620
Commit: e2c345c9a6523bbc663248ad983855c2b32a9553
Author: Sergey Sharybin
Date: Tue Jun 21 15:07:45 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBe2c345c9a6523bbc663248ad983855c2b32a9553
Build Deps: Bump DPC++ version to sycl-nightly/20220620
Needed to update vc-intrinsics and SPIR-V dependencies to solve
compilation errors as well.
===
M build_files/build_environment/cmake/versions.cmake
===
diff --git a/build_files/build_environment/cmake/versions.cmake
b/build_files/build_environment/cmake/versions.cmake
index ff5ea8bf8aa..6d3544c42de 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -503,9 +503,9 @@ set(LEVEL_ZERO_HASH
c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb
set(LEVEL_ZERO_HASH_TYPE SHA256)
set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
-set(DPCPP_VERSION 20220529)
+set(DPCPP_VERSION 20220620)
set(DPCPP_URI
https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
-set(DPCPP_HASH
1a9b95b4fd589e97dc7ce8bad24909d79605ffcafd5c68ef5bdad8c1eeefcafd)
+set(DPCPP_HASH
a5f41abd5229d28afa92cbd8a5d8d786ee698bf239f722929fd686276bad692c)
set(DPCPP_HASH_TYPE SHA256)
set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
@@ -518,9 +518,9 @@ set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
# will take care of building them, unpack is being done in dpcpp_deps.cmake
# Source llvm/lib/SYCLLowerIR/CMakeLists.txt
-set(VCINTRINSICS_VERSION 8b6e209fe1269a2c6470b36dfbaa0e051d2a100f)
+set(VCINTRINSICS_VERSION 984bb27baacce6ee5c716c2e64845f2a1928025b)
set(VCINTRINSICS_URI
https://github.com/intel/vc-intrinsics/archive/${VCINTRINSICS_VERSION}.tar.gz)
-set(VCINTRINSICS_HASH
19fb13ac32f7138c6ab9f015ba1025a42a4775ef845ff4af4df6d4ff4f4bbb29)
+set(VCINTRINSICS_HASH
abea415a15a0dd11fdc94dee8fb462910f2548311b787e02f42509789e1b0d7b)
set(VCINTRINSICS_HASH_TYPE SHA256)
set(VCINTRINSICS_FILE vc-intrinsics-${VCINTRINSICS_VERSION}.tar.gz)
@@ -549,9 +549,9 @@ set(MP11_FILE mp11-${MP11_VERSION}.tar.gz)
# Source llvm-spirv/CMakeLists.txt (repo)
# Source llvm-spirv/spirv-headers-tag.conf (hash)
-set(SPIRV_HEADERS_VERSION 4995a2f2723c401eb0ea3e10c81298906bf1422b)
+set(SPIRV_HEADERS_VERSION 36c0c1596225e728bd49abb7ef56a3953e7ed468)
set(SPIRV_HEADERS_URI
https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_VERSION}.tar.gz)
-set(SPIRV_HEADERS_HASH
2c9fe1bbd74a74fdabe40a7ffb322527dfc008c79e1d19d3cf41a5f006d9ab60)
+set(SPIRV_HEADERS_HASH
7a5c89633f8740456fe8adee052033e134476d267411d1336c0cb1e587a9229a)
set(SPIRV_HEADERS_HASH_TYPE SHA256)
set(SPIRV_HEADERS_FILE SPIR-V-Headers-${SPIRV_HEADERS_VERSION}.tar.gz)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9ef12c68ee2] cycles_oneapi: Cycles oneAPI: Fix clang headers used from DPCPP folder
Commit: 9ef12c68ee22f2ba255b78c424591a52205f2ce3
Author: Sergey Sharybin
Date: Tue Jun 21 12:39:18 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB9ef12c68ee22f2ba255b78c424591a52205f2ce3
Cycles oneAPI: Fix clang headers used from DPCPP folder
===
M build_files/cmake/platform/platform_unix.cmake
===
diff --git a/build_files/cmake/platform/platform_unix.cmake
b/build_files/cmake/platform/platform_unix.cmake
index 90d21463f0e..03a002a7ff4 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -38,9 +38,15 @@ if(EXISTS ${LIBDIR})
message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
+
# Ignore Mesa software OpenGL libraries, they are not intended to be
# linked against but to optionally override at runtime.
list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/mesa)
+
+ # Ignore DPC++ as it contains its own copy of LLVM/CLang which we do
+ # not need to be ever discovered for the Blender linking.
+ list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/dpcpp)
+
# NOTE: Make sure "proper" compiled zlib comes first before the one
# which is a part of OpenCollada. They have different ABI, and we
# do need to use the official one.
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [78b9a124cda] cycles_oneapi: Build Deps: Tweak install directory for igc and ocloc
Commit: 78b9a124cdac52b856459d7ae53c92c64ae1ec72
Author: Sergey Sharybin
Date: Tue Jun 21 12:12:13 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB78b9a124cdac52b856459d7ae53c92c64ae1ec72
Build Deps: Tweak install directory for igc and ocloc
Matches path at which ahead-of-time kernel compilation expects
them to be.
===
M build_files/build_environment/cmake/igc.cmake
M build_files/build_environment/cmake/ocloc.cmake
===
diff --git a/build_files/build_environment/cmake/igc.cmake
b/build_files/build_environment/cmake/igc.cmake
index faae8d00611..2d6e19de34d 100644
--- a/build_files/build_environment/cmake/igc.cmake
+++ b/build_files/build_environment/cmake/igc.cmake
@@ -88,7 +88,7 @@ ExternalProject_Add(external_igc
URL file://${PACKAGE_DIR}/${IGC_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${IGC_HASH_TYPE}=${IGC_HASH}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/igc ${DEFAULT_CMAKE_FLAGS}
${IGC_EXTRA_ARGS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp/lib/igc
${DEFAULT_CMAKE_FLAGS} ${IGC_EXTRA_ARGS}
# IGC is pretty set in its way where sub projects ought to live, for some it
offers
# hooks to supply alternatives folders, other are just hardocded with no way
to configure
diff --git a/build_files/build_environment/cmake/ocloc.cmake
b/build_files/build_environment/cmake/ocloc.cmake
index f686d2dd4fc..b38f31de189 100644
--- a/build_files/build_environment/cmake/ocloc.cmake
+++ b/build_files/build_environment/cmake/ocloc.cmake
@@ -13,7 +13,7 @@ ExternalProject_Add(external_ocloc
URL_HASH ${OCLOC_HASH_TYPE}=${OCLOC_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/ocloc
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ocloc ${DEFAULT_CMAKE_FLAGS}
${OCLOC_EXTRA_ARGS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp/lib/ocloc
${DEFAULT_CMAKE_FLAGS} ${OCLOC_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/ocloc
)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ffb155ee33d] cycles_oneapi: Cycles oneAPI: tweak logging verbosity levels
Commit: ffb155ee33d6d801ab0d5d2424fb75c1e79f6688
Author: Sergey Sharybin
Date: Tue Jun 21 11:28:48 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBffb155ee33d6d801ab0d5d2424fb75c1e79f6688
Cycles oneAPI: tweak logging verbosity levels
- Use more semantic macros for logging instead of magic constants.
- Move debugging log to a more verbose level.
Levels might still need to be adjusted to make them even more semantic,
but for now the goal is to allow `blender --debug-cycles` to output the
final time statistics without spamming the console with memory allocator
logs.
===
M intern/cycles/device/oneapi/device.cpp
M intern/cycles/device/oneapi/device_impl.cpp
M intern/cycles/device/oneapi/queue.cpp
===
diff --git a/intern/cycles/device/oneapi/device.cpp
b/intern/cycles/device/oneapi/device.cpp
index fb7ade1c240..326bdfabe92 100644
--- a/intern/cycles/device/oneapi/device.cpp
+++ b/intern/cycles/device/oneapi/device.cpp
@@ -67,7 +67,7 @@ bool device_oneapi_init()
# include "kernel/device/oneapi/dll_interface_template.h"
# undef DLL_INTERFACE_CALL
- VLOG(1) << "oneAPI kernel shared library has been loaded successfully";
+ VLOG_INFO << "oneAPI kernel shared library has been loaded successfully";
// We need to have this oneapi kernel shared library during all life-span of
the Blender.
// So it is not unloaded because of this.
@@ -152,7 +152,7 @@ static void device_iterator_cb(const char *id, const char
*name, int num, void *
info.display_device = false;
devices->push_back(info);
- VLOG(1) << "Added device \"" << name << "\" with id \"" << info.id << "\".";
+ VLOG_INFO << "Added device \"" << name << "\" with id \"" << info.id <<
"\".";
}
#endif
diff --git a/intern/cycles/device/oneapi/device_impl.cpp
b/intern/cycles/device/oneapi/device_impl.cpp
index 1621cf4c1f1..a2f79fa1bed 100644
--- a/intern/cycles/device/oneapi/device_impl.cpp
+++ b/intern/cycles/device/oneapi/device_impl.cpp
@@ -44,8 +44,8 @@ OneapiDevice::OneapiDevice(const DeviceInfo &info,
"\"");
}
else {
-VLOG(1) << "oneAPI queue has been successfully created for the device \""
<< info.description
-<< "\"";
+VLOG_DEBUG << "oneAPI queue has been successfully created for the device
\""
+ << info.description << "\"";
assert(device_queue);
}
@@ -56,7 +56,7 @@ OneapiDevice::OneapiDevice(const DeviceInfo &info,
oneapi_error_string + "\"");
}
else {
-VLOG(1) << "Successfully created global/constant memory segment (kernel
globals object)";
+VLOG_DEBUG << "Successfully created global/constant memory segment (kernel
globals object)";
}
kg_memory = oneapi_dll.oneapi_usm_aligned_alloc_host(device_queue,
globals_segment_size, 16);
@@ -102,7 +102,7 @@ bool OneapiDevice::load_kernels(const uint
requested_features)
set_error("oneAPI kernel load: got runtime exception \"" +
oneapi_error_string + "\"");
}
else {
-VLOG(1) << "Runtime compilation done for \"" << info.description << "\"";
+VLOG_INFO << "Runtime compilation done for \"" << info.description << "\"";
assert(device_queue);
}
return is_finished_ok;
@@ -205,9 +205,9 @@ void OneapiDevice::mem_alloc(device_memory &mem)
}
else {
if (mem.name) {
- VLOG(2) << "OneapiDevice::mem_alloc: \"" << mem.name << "\", "
- << string_human_readable_number(mem.memory_size()) << " bytes. ("
- << string_human_readable_size(mem.memory_size()) << ")";
+ VLOG_DEBUG << "OneapiDevice::mem_alloc: \"" << mem.name << "\", "
+ << string_human_readable_number(mem.memory_size()) << "
bytes. ("
+ << string_human_readable_size(mem.memory_size()) << ")";
}
generic_alloc(mem);
}
@@ -216,9 +216,9 @@ void OneapiDevice::mem_alloc(device_memory &mem)
void OneapiDevice::mem_copy_to(device_memory &mem)
{
if (mem.name) {
-VLOG(4) << "OneapiDevice::mem_copy_to: \"" << mem.name << "\", "
-<< string_human_readable_number(mem.memory_size()) << " bytes. ("
-<< string_human_readable_size(mem.memory_size()) << ")";
+VLOG_DEBUG << "OneapiDevice::mem_copy_to: \"" << mem.name << "\", "
+ << string_human_readable_number(mem.memory_size()) << " bytes.
("
+ << string_human_readable_size(mem.memory_size()) << ")";
}
if (mem.type == MEM_GLOBAL) {
@@ -247,10 +247,10 @@ void OneapiDevice::mem_copy_from(device_memory &mem,
size_t y, size_t w, size_t
const size_t offset = elem * y * w;
if (mem.name) {
- VLOG(4) << "OneapiDevice::mem_copy_from: \"" << mem.name << "\" object
of "
- << string_human_readable_number(mem.memory_size()) << " bytes. ("
- << string_human_readable_size(mem.memory_size()) << ") from
offset " << offset
-
[Bf-blender-cvs] [ee78c860b8a] master: LineArt: Move style options to top of the modifier.
Commit: ee78c860b8aa4206ec4d00d733b23c0a0f8d469a
Author: Yiming Wu
Date: Tue Jun 21 15:17:30 2022 +0800
Branches: master
https://developer.blender.org/rBee78c860b8aa4206ec4d00d733b23c0a0f8d469a
LineArt: Move style options to top of the modifier.
Reviewed By: Antonio Vazquez (antoniov)
Differential Revision: https://developer.blender.org/D15164
===
M source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
===
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index f179713e8cb..8d77fb50c71 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -324,6 +324,10 @@ static void panel_draw(const bContext *UNUSED(C), Panel
*panel)
uiItemPointerR(
row, ptr, "target_material", &obj_data_ptr, "materials", NULL,
ICON_SHADING_TEXTURE);
+ uiLayout *col = uiLayoutColumn(layout, false);
+ uiItemR(col, ptr, "thickness", UI_ITEM_R_SLIDER, IFACE_("Line Thickness"),
ICON_NONE);
+ uiItemR(col, ptr, "opacity", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+
gpencil_modifier_panel_end(layout, ptr);
}
@@ -398,21 +402,6 @@ static void options_panel_draw(const bContext *UNUSED(C),
Panel *panel)
uiItemR(col, ptr, "use_back_face_culling", 0, IFACE_("Force Backface
Culling"), ICON_NONE);
}
-static void style_panel_draw(const bContext *UNUSED(C), Panel *panel)
-{
- uiLayout *layout = panel->layout;
- PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
-
- const bool is_baked = RNA_boolean_get(ptr, "is_baked");
-
- uiLayoutSetPropSep(layout, true);
- uiLayoutSetEnabled(layout, !is_baked);
-
- uiItemR(layout, ptr, "thickness", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-
- uiItemR(layout, ptr, "opacity", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-}
-
static void occlusion_panel_draw(const bContext *UNUSED(C), Panel *panel)
{
uiLayout *layout = panel->layout;
@@ -708,8 +697,6 @@ static void panelRegister(ARegionType *region_type)
region_type, "edge_types", "Edge Types", NULL, edge_types_panel_draw,
panel_type);
gpencil_modifier_subpanel_register(
region_type, "geometry", "Geometry Processing", NULL,
options_panel_draw, panel_type);
- gpencil_modifier_subpanel_register(
- region_type, "style", "Style", NULL, style_panel_draw, panel_type);
PanelType *occlusion_panel = gpencil_modifier_subpanel_register(
region_type, "occlusion", "Occlusion", NULL, occlusion_panel_draw,
panel_type);
gpencil_modifier_subpanel_register(region_type,
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [84fc0862543] master: Fix T98919: Eevee unlinked aov output nodes don't render.
Commit: 84fc08625431e2cbd1c495eebed11e42cf9b6901
Author: Jeroen Bakker
Date: Tue Jun 21 09:45:40 2022 +0200
Branches: master
https://developer.blender.org/rB84fc08625431e2cbd1c495eebed11e42cf9b6901
Fix T98919: Eevee unlinked aov output nodes don't render.
Eevee rendered an empty image for aov nodes that weren't linked to
any other nodes. When connected the result was OK. The root cause was
that the AOV nodes were not marked as output node and pruned when not
connected to any other nodes. The pruning process is there to reduce
the complexity of the GLSL and improve compilation time and
execution time.
===
M source/blender/nodes/shader/node_shader_tree.cc
===
diff --git a/source/blender/nodes/shader/node_shader_tree.cc
b/source/blender/nodes/shader/node_shader_tree.cc
index f107ec73c60..24558e4b32b 100644
--- a/source/blender/nodes/shader/node_shader_tree.cc
+++ b/source/blender/nodes/shader/node_shader_tree.cc
@@ -1007,6 +1007,7 @@ static void ntree_shader_pruned_unused(bNodeTree *ntree,
bNode *output_node)
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
if (node->type == SH_NODE_OUTPUT_AOV) {
+ node->tmp_flag = 1;
nodeChainIterBackwards(ntree, node, ntree_branch_node_tag, nullptr, 0);
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
