bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Brecht Van Lommel 2024-06-19 20:54:33 +02:00
commit cbc6170519
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -700,7 +700,7 @@ if(NOT APPLE AND NOT (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64"))
gfx900 gfx90c gfx902
gfx1010 gfx1011 gfx1012
gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1036
gfx1100 gfx1101 gfx1102 gfx1103
gfx1100 gfx1101 gfx1102 gfx1103 gfx1150 gfx1151
CACHE STRING "AMD HIP architectures to build binaries for"
)
mark_as_advanced(WITH_CYCLES_DEVICE_HIP)

2
GNUmakefile
View File

@ -192,7 +192,7 @@ endif
DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment
ifndef DEPS_BUILD_DIR
DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
DEPS_BUILD_DIR:=$(BUILD_DIR)/deps_$(CPU)
endif
ifndef DEPS_INSTALL_DIR

2
build_files/cmake/Modules/FindHIP.cmake
View File

@ -23,6 +23,8 @@ endif()
set(_hip_SEARCH_DIRS
${HIP_ROOT_DIR}
/opt/rocm
/opt/rocm/hip
)
find_program(HIP_HIPCC_EXECUTABLE

4
build_files/config/pipeline_config.yaml
View File

@ -13,9 +13,9 @@ buildbot:
cuda12:
version: '12.1.1'
hip:
version: '5.5.30571'
version: '5.7.32000'
hiprt:
version: '2.0.3a134c7'
version: '2.0.e1ff193'
optix:
version: '7.3.0'
ocloc:

2
source/blender/draw/engines/eevee_next/eevee_ambient_occlusion.cc
View File

@ -79,7 +79,7 @@ void AmbientOcclusion::sync()
render_pass_ps_.push_constant("out_ao_img_layer_index",
&inst_.render_buffers.data.ambient_occlusion_id);
render_pass_ps_.barrier(GPU_BARRIER_SHADER_IMAGE_ACCESS & GPU_BARRIER_TEXTURE_FETCH);
render_pass_ps_.barrier(GPU_BARRIER_SHADER_IMAGE_ACCESS | GPU_BARRIER_TEXTURE_FETCH);
render_pass_ps_.dispatch(
math::divide_ceil(inst_.film.render_extent_get(), int2(AMBIENT_OCCLUSION_PASS_TILE_SIZE)));
}

2
source/blender/draw/engines/eevee_next/shaders/infos/eevee_ambient_occlusion_info.hh
View File

@ -11,7 +11,7 @@ GPU_SHADER_CREATE_INFO(eevee_ambient_occlusion_pass)
.local_group_size(AMBIENT_OCCLUSION_PASS_TILE_SIZE, AMBIENT_OCCLUSION_PASS_TILE_SIZE)
.image(0, GPU_RGBA16F, Qualifier::READ, ImageType::FLOAT_2D_ARRAY, "in_normal_img")
.push_constant(Type::INT, "in_normal_img_layer_index")
.image(1, GPU_RG16F, Qualifier::WRITE, ImageType::FLOAT_2D_ARRAY, "out_ao_img")
.image(1, GPU_R16F, Qualifier::WRITE, ImageType::FLOAT_2D_ARRAY, "out_ao_img")
.push_constant(Type::INT, "out_ao_img_layer_index")
.specialization_constant(Type::INT, "ao_slice_count", 2)
.specialization_constant(Type::INT, "ao_step_count", 8)