diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-03-08 15:48:47 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-03-08 15:48:47 +0300 |
| commit | 6f8e65cd7aa9598d7c440d2ac05e51c241836662 (patch) | |
| tree | 5e6b361423d5c7928ab6de2b29a5353746f8fe5c /source | |
| parent | 64a5fd7a1dce5ea4d24bcced42d885b165cc2d41 (diff) | |
| parent | d5e4cab76c625c45b73868cf27021de1fada2830 (diff) | |
Merge remote-tracking branch 'origin/blender-v3.1-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_image_partial_update.hh | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_extract_mesh.cc | 1 | ||||
| -rw-r--r-- | source/blender/gpu/opengl/gl_backend.cc | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh index 45b08e17920..8cbb8819551 100644 --- a/source/blender/blenkernel/BKE_image_partial_update.hh +++ b/source/blender/blenkernel/BKE_image_partial_update.hh @@ -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) diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.cc b/source/blender/draw/intern/draw_cache_extract_mesh.cc index dea3fa9b75a..e84f2c7a327 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh.cc @@ -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); diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc index 302d8249914..f0d7a23ef82 100644 --- a/source/blender/gpu/opengl/gl_backend.cc +++ b/source/blender/gpu/opengl/gl_backend.cc @@ -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") || |