Fix T68944: Added check for SSE4.1 to denoising node.
Since OpenImageDenoise requires a CPU with SSE 4.1 or newer, let the node act as passthrough on unsupported CPUs and display a message in the node itself.
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
*/
|
||||
|
||||
int BLI_cpu_support_sse2(void);
|
||||
int BLI_cpu_support_sse41(void);
|
||||
void BLI_system_backtrace(FILE *fp);
|
||||
|
||||
/* Get CPU brand, result is to be MEM_freeN()-ed. */
|
||||
|
@@ -179,6 +179,19 @@ char *BLI_cpu_brand_string(void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int BLI_cpu_support_sse41(void)
|
||||
{
|
||||
int result[4], num;
|
||||
__cpuid(result, 0);
|
||||
num = result[0];
|
||||
|
||||
if (num >= 1) {
|
||||
__cpuid(result, 0x00000001);
|
||||
return (result[2] & ((int)1 << 19)) != 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void BLI_hostname_get(char *buffer, size_t bufsize)
|
||||
{
|
||||
#ifndef WIN32
|
||||
|
@@ -97,6 +97,7 @@ void DenoiseOperation::generateDenoise(float *data,
|
||||
return;
|
||||
}
|
||||
#ifdef WITH_OPENIMAGEDENOISE
|
||||
if (BLI_cpu_support_sse41()) {
|
||||
oidn::DeviceRef device = oidn::newDevice();
|
||||
device.commit();
|
||||
|
||||
@@ -153,10 +154,12 @@ void DenoiseOperation::generateDenoise(float *data,
|
||||
for (size_t i = 0; i < numPixels; ++i) {
|
||||
data[i * 4 + 3] = inputBufferColor[i * 4 + 3];
|
||||
}
|
||||
#else
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
/* If built without OIDN or running on an unsupported CPU, just pass through. */
|
||||
UNUSED_VARS(inputTileAlbedo, inputTileNormal, settings);
|
||||
::memcpy(data,
|
||||
inputBufferColor,
|
||||
inputTileColor->getWidth() * inputTileColor->getHeight() * sizeof(float) * 4);
|
||||
#endif
|
||||
}
|
||||
|
@@ -2703,6 +2703,10 @@ static void node_composit_buts_denoise(uiLayout *layout, bContext *UNUSED(C), Po
|
||||
{
|
||||
#ifndef WITH_OPENIMAGEDENOISE
|
||||
uiItemL(layout, IFACE_("Disabled, built without OpenImageDenoise"), ICON_ERROR);
|
||||
#else
|
||||
if (!BLI_cpu_support_sse41()) {
|
||||
uiItemL(layout, IFACE_("Disabled, CPU with SSE4.1 is required"), ICON_ERROR);
|
||||
}
|
||||
#endif
|
||||
|
||||
uiItemR(layout, ptr, "use_hdr", 0, NULL, ICON_NONE);
|
||||
|
Reference in New Issue
Block a user