mirror of
https://github.com/blender/blender
synced 2026-09-29 04:37:17 +03:00
5fc85d1cb7
The new intersect_mnee kernel runs before shade_surface, and shade_surface_mnee is eliminated. That large kernel was causing problems for some GPU compilers. MNEE state is packed into a shadow path state to avoid significantly increasing the path state size. This shadow state is then either turned into an actual shadow ray state or discarded in shade_surface. MNEE was re-enabled on HIP RDNA2 as it works again now. Texture cache misses now also work correctly with MNEE. This adds some extra code to the regular shade_surface kernel even when MNEE is not used, to use the MNEE sampled point instead of sampling a light. But there seems to be no significant performance impact. Co-authored-by: Sergey Sharybin <sergey@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/158698
92 lines
2.6 KiB
C++
92 lines
2.6 KiB
C++
/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 */
|
|
|
|
#pragma once
|
|
|
|
#ifdef WITH_HIP
|
|
|
|
# include <cstring>
|
|
# include <string>
|
|
|
|
# ifdef WITH_HIP_DYNLOAD
|
|
# include "hipew.h"
|
|
# endif
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
class HIPDevice;
|
|
|
|
/* Utility to push/pop HIP context. */
|
|
class HIPContextScope {
|
|
public:
|
|
HIPContextScope(HIPDevice *device);
|
|
~HIPContextScope();
|
|
|
|
private:
|
|
HIPDevice *device;
|
|
};
|
|
|
|
/* Utility for checking return values of HIP function calls. */
|
|
# define hip_device_assert(hip_device, stmt) \
|
|
{ \
|
|
hipError_t result = stmt; \
|
|
if (result != hipSuccess) { \
|
|
const char *name = hipewErrorString(result); \
|
|
hip_device->set_error( \
|
|
string_printf("%s in %s (%s:%d)", name, #stmt, __FILE__, __LINE__)); \
|
|
} \
|
|
} \
|
|
(void)0
|
|
|
|
# define hip_assert(stmt) hip_device_assert(this, stmt)
|
|
|
|
# ifndef WITH_HIP_DYNLOAD
|
|
/* Transparently implement some functions, so majority of the file does not need
|
|
* to worry about difference between dynamically loaded and linked HIP at all. */
|
|
const char *hipewErrorString(hipError_t result);
|
|
const char *hipewCompilerPath();
|
|
int hipewCompilerVersion();
|
|
# endif /* !WITH_HIP_DYNLOAD */
|
|
|
|
bool hipSupportsDriver();
|
|
|
|
static std::string hipDeviceArch(const int hipDevId)
|
|
{
|
|
hipDeviceProp_t props;
|
|
hipGetDeviceProperties(&props, hipDevId);
|
|
const char *arch = strtok(props.gcnArchName, ":");
|
|
return (arch == nullptr) ? props.gcnArchName : arch;
|
|
}
|
|
|
|
static inline bool hipSupportsDevice(const int hipDevId)
|
|
{
|
|
int major, minor;
|
|
hipDeviceGetAttribute(&major, hipDeviceAttributeComputeCapabilityMajor, hipDevId);
|
|
hipDeviceGetAttribute(&minor, hipDeviceAttributeComputeCapabilityMinor, hipDevId);
|
|
|
|
return (major >= 10);
|
|
}
|
|
|
|
static inline bool hipIsRDNA2OrNewer(const int hipDevId)
|
|
{
|
|
int major, minor;
|
|
hipDeviceGetAttribute(&major, hipDeviceAttributeComputeCapabilityMajor, hipDevId);
|
|
hipDeviceGetAttribute(&minor, hipDeviceAttributeComputeCapabilityMinor, hipDevId);
|
|
|
|
return (major > 10 || (major == 10 && minor >= 3));
|
|
}
|
|
|
|
static inline bool hipSupportsDeviceOIDN(const int hipDevId)
|
|
{
|
|
/* Matches HIPDevice::getArch in HIP. */
|
|
const std::string arch = hipDeviceArch(hipDevId);
|
|
return (arch == "gfx1030" || arch == "gfx1031" || arch == "gfx1032" || arch == "gfx1034" ||
|
|
arch == "gfx1035" || arch == "gfx1036" || arch == "gfx1100" || arch == "gfx1101" ||
|
|
arch == "gfx1102" || arch == "gfx1103" || arch == "gfx1150" || arch == "gfx1151" ||
|
|
arch == "gfx1152" || arch == "gfx1200" || arch == "gfx1201");
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* WITH_HIP */
|