Fix #116489: Improper use of enum in GLSL file

Use defines instead.
This commit is contained in:
Clément Foucault
2023-12-24 20:16:22 +13:00
parent 57a3f2f685
commit c0fe51678e

View File

@@ -128,32 +128,27 @@ vec4 tangent_get(vec4 attr, mat3 normalmat)
# define FrontFacing true
#endif
typedef enum ClosureType {
CLOSURE_NONE_ID = 0u,
/* Diffuse */
CLOSURE_BSDF_DIFFUSE_ID = 1u,
// CLOSURE_BSDF_OREN_NAYAR_ID = 2u, /* TODO */
// CLOSURE_BSDF_SHEEN_ID = 4u, /* TODO */
// CLOSURE_BSDF_DIFFUSE_TOON_ID = 5u, /* TODO */
CLOSURE_BSDF_TRANSLUCENT_ID = 6u,
/* Glossy */
CLOSURE_BSDF_MICROFACET_GGX_REFLECTION_ID = 7u,
// CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ID = 8u, /* TODO */
// CLOSURE_BSDF_ASHIKHMIN_VELVET_ID = 9u, /* TODO */
// CLOSURE_BSDF_GLOSSY_TOON_ID = 10u, /* TODO */
// CLOSURE_BSDF_HAIR_REFLECTION_ID = 11u, /* TODO */
/* Transmission */
CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID = 12u,
/* Glass */
// CLOSURE_BSDF_HAIR_HUANG_ID = 13u, /* TODO */
/* BSSRDF */
CLOSURE_BSSRDF_BURLEY_ID = 14u,
} ClosureType;
/* Can't use enum here because not a header file. But would be great to do. */
#define ClosureType uint
#define CLOSURE_NONE_ID 0u
/* Diffuse */
#define CLOSURE_BSDF_DIFFUSE_ID 1u
#define CLOSURE_BSDF_OREN_NAYAR_ID 2u /* TODO */
#define CLOSURE_BSDF_SHEEN_ID 4u /* TODO */
#define CLOSURE_BSDF_DIFFUSE_TOON_ID 5u /* TODO */
#define CLOSURE_BSDF_TRANSLUCENT_ID 6u
/* Glossy */
#define CLOSURE_BSDF_MICROFACET_GGX_REFLECTION_ID 7u
#define CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ID 8u /* TODO */
#define CLOSURE_BSDF_ASHIKHMIN_VELVET_ID 9u /* TODO */
#define CLOSURE_BSDF_GLOSSY_TOON_ID 10u /* TODO */
#define CLOSURE_BSDF_HAIR_REFLECTION_ID 11u /* TODO */
/* Transmission */
#define CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID 12u
/* Glass */
#define CLOSURE_BSDF_HAIR_HUANG_ID 13u /* TODO */
/* BSSRDF */
#define CLOSURE_BSSRDF_BURLEY_ID 14u
struct ClosureUndetermined {
vec3 color;