blender
/
blender
138
418
Fork 600
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

Fix #118466: Cycles renders black on Metal + AMD #119175

Merged
Brecht Van Lommel merged 2 commits from brecht/blender:amd-debug into blender-v4.1-release 2024-03-08 16:41:37 +01:00
Conversation 5 Commits 2 Files Changed 3 +6 -5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 96ee74d0dc - Show all commits

11
intern/cycles/device/metal/device_impl.mm
View File

@ -340,11 +340,6 @@ string MetalDevice::preprocess_source(MetalPipelineType pso_type,
}
}
if (@available(macos 14.0, *)) {
/* Use Program Scope Global Built-ins, when available. */
global_defines += "#define __METAL_GLOBAL_BUILTINS__\n";
}
# ifdef WITH_CYCLES_DEBUG
global_defines += "#define __KERNEL_DEBUG__\n";
# endif
@ -366,6 +361,12 @@ string MetalDevice::preprocess_source(MetalPipelineType pso_type,
break;
case METAL_GPU_APPLE:
global_defines += "#define __KERNEL_METAL_APPLE__\n";
if (@available(macos 14.0, *)) {
/* Use Program Scope Global Built-ins, when available. */
global_defines += "#define __METAL_GLOBAL_BUILTINS__\n";
}
# ifdef WITH_NANOVDB
/* Compiling in NanoVDB results in a marginal drop in render performance,
* so disable it for specialized PSOs when no textures are using it. */