archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge remote-tracking branch 'origin/blender-v3.1-release'

Browse Source
This commit is contained in:
Kévin Dietrich
2022-03-08 13:48:47 +01:00
parent 64a5fd7a1d d5e4cab76c
commit 6f8e65cd7a
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_image_partial_update.hh
View File

@@ -212,7 +212,7 @@ template<typename TileData = NoTileData> struct PartialUpdateChecker {
ePartialUpdateCollectResult result_code;
private:
TileNumber last_tile_number;
TileNumber last_tile_number = 0;
public:
CollectResult(PartialUpdateChecker<TileData> *checker, ePartialUpdateCollectResult result_code)

1
source/blender/draw/intern/draw_cache_extract_mesh.cc
View File

@@ -854,6 +854,7 @@ static void mesh_buffer_cache_create_requested_subdiv(MeshBatchCache *cache,
}
mesh_render_data_update_looptris(mr, MR_ITER_LOOPTRI, MR_DATA_LOOPTRI);
mesh_render_data_update_normals(mr, MR_DATA_TAN_LOOP_NOR);
mesh_render_data_update_loose_geom(mr, mbc, MR_ITER_LEDGE | MR_ITER_LVERT, MR_DATA_LOOSE_GEOM);
DRW_subdivide_loose_geom(subdiv_cache, mbc);

5
source/blender/gpu/opengl/gl_backend.cc
View File

@@ -270,6 +270,11 @@ static void detect_workarounds()
GCaps.shader_image_load_store_support = false;
GCaps.broken_amd_driver = true;
}
/* Compute shaders have some issues with those versions (see T94936). */
if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_OFFICIAL) &&
(strstr(version, "4.5.14831") || strstr(version, "4.5.14760"))) {
GCaps.compute_shader_support = false;
}
/* We have issues with this specific renderer. (see T74024) */
if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE) &&
(strstr(renderer, "AMD VERDE") || strstr(renderer, "AMD KAVERI") ||