Fix #104906: GPU: Fix signed/unsigned mismatches in shader code #105153

Merged
Clément Foucault merged 2 commits from johannesj/blender:20230223-signed-unsigned into blender-v3.5-release 2023-02-26 16:14:07 +01:00
1 changed files with 25 additions and 25 deletions

View File

@ -88,33 +88,33 @@ struct MultiIconCallData {
BLI_STATIC_ASSERT_ALIGN(struct MultiIconCallData, 16)
enum TestStatus {
TEST_STATUS_NONE = 0,
TEST_STATUS_PASSED = 1,
TEST_STATUS_FAILED = 2,
TEST_STATUS_NONE = 0u,
TEST_STATUS_PASSED = 1u,
TEST_STATUS_FAILED = 2u,
};
enum TestType {
TEST_TYPE_BOOL = 0,
TEST_TYPE_UINT = 1,
TEST_TYPE_INT = 2,
TEST_TYPE_FLOAT = 3,
TEST_TYPE_IVEC2 = 4,
TEST_TYPE_IVEC3 = 5,
TEST_TYPE_IVEC4 = 6,
TEST_TYPE_UVEC2 = 7,
TEST_TYPE_UVEC3 = 8,
TEST_TYPE_UVEC4 = 9,
TEST_TYPE_VEC2 = 10,
TEST_TYPE_VEC3 = 11,
TEST_TYPE_VEC4 = 12,
TEST_TYPE_MAT2X2 = 13,
TEST_TYPE_MAT2X3 = 14,
TEST_TYPE_MAT2X4 = 15,
TEST_TYPE_MAT3X2 = 16,
TEST_TYPE_MAT3X3 = 17,
TEST_TYPE_MAT3X4 = 18,
TEST_TYPE_MAT4X2 = 19,
TEST_TYPE_MAT4X3 = 20,
TEST_TYPE_MAT4X4 = 21,
TEST_TYPE_BOOL = 0u,
TEST_TYPE_UINT = 1u,
TEST_TYPE_INT = 2u,
TEST_TYPE_FLOAT = 3u,
TEST_TYPE_IVEC2 = 4u,
TEST_TYPE_IVEC3 = 5u,
TEST_TYPE_IVEC4 = 6u,
TEST_TYPE_UVEC2 = 7u,
TEST_TYPE_UVEC3 = 8u,
TEST_TYPE_UVEC4 = 9u,
TEST_TYPE_VEC2 = 10u,
TEST_TYPE_VEC3 = 11u,
TEST_TYPE_VEC4 = 12u,
TEST_TYPE_MAT2X2 = 13u,
TEST_TYPE_MAT2X3 = 14u,
TEST_TYPE_MAT2X4 = 15u,
TEST_TYPE_MAT3X2 = 16u,
TEST_TYPE_MAT3X3 = 17u,
TEST_TYPE_MAT3X4 = 18u,
TEST_TYPE_MAT4X2 = 19u,
TEST_TYPE_MAT4X3 = 20u,
TEST_TYPE_MAT4X4 = 21u,
};
/** \note Contains arrays of scalar. To be use only with SSBOs to avoid padding issues. */