Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +14 -6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ac6a70e5f8 - Show all commits

10
source/blender/gpu/metal/mtl_texture_util.mm
View File

@ -342,9 +342,13 @@ id<MTLComputePipelineState> gpu::MTLTexture::mtl_texture_update_impl(
options:options options:options
error:&error] autorelease]; error:&error] autorelease];
if (error) { if (error) {
/* Only exit out if genuine error and not warning. */
if ([[error localizedDescription] rangeOfString:@"Compilation succeeded"].location ==
NSNotFound) {
NSLog(@"Compile Error - Metal Shader Library error %@ ", error); NSLog(@"Compile Error - Metal Shader Library error %@ ", error);
BLI_assert(false); BLI_assert(false);
return nullptr; return nil;
}
} }
/* Fetch compute function. */ /* Fetch compute function. */
@ -658,10 +662,14 @@ id<MTLComputePipelineState> gpu::MTLTexture::mtl_texture_read_impl(
options:options options:options
error:&error] autorelease]; error:&error] autorelease];
if (error) { if (error) {
/* Only exit out if genuine error and not warning. */
if ([[error localizedDescription] rangeOfString:@"Compilation succeeded"].location ==
NSNotFound) {
NSLog(@"Compile Error - Metal Shader Library error %@ ", error); NSLog(@"Compile Error - Metal Shader Library error %@ ", error);
BLI_assert(false); BLI_assert(false);
return nil; return nil;
} }
}
/* Fetch compute function. */ /* Fetch compute function. */
BLI_assert(temp_lib != nil); BLI_assert(temp_lib != nil);