From 11da2fb2051894b3cc873748cfc8f47588d8af93 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 2 Mar 2022 10:07:26 -0500 Subject: Small fix to use SlangResult (#2149) * Use SlangResult value. Make legacy SLANG_ERROR_ macros use SlangResult values. --- source/slang/slang-reflection-api.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source/slang/slang-reflection-api.cpp') diff --git a/source/slang/slang-reflection-api.cpp b/source/slang/slang-reflection-api.cpp index 8919e2ba5..583e000a6 100644 --- a/source/slang/slang-reflection-api.cpp +++ b/source/slang/slang-reflection-api.cpp @@ -265,27 +265,28 @@ SlangReflectionType* spReflectionUserAttribute_GetArgumentType(SlangReflectionUs SLANG_API SlangResult spReflectionUserAttribute_GetArgumentValueInt(SlangReflectionUserAttribute* attrib, unsigned int index, int * rs) { auto userAttr = convert(attrib); - if (!userAttr) return SLANG_ERROR_INVALID_PARAMETER; - if (index >= (unsigned int)userAttr->args.getCount()) return SLANG_ERROR_INVALID_PARAMETER; + if (!userAttr) return SLANG_E_INVALID_ARG; + if (index >= (unsigned int)userAttr->args.getCount()) return SLANG_E_INVALID_ARG; + NodeBase* val = nullptr; if (userAttr->intArgVals.TryGetValue(index, val)) { *rs = (int)as(val)->value; return 0; } - return SLANG_ERROR_INVALID_PARAMETER; + return SLANG_E_INVALID_ARG; } SLANG_API SlangResult spReflectionUserAttribute_GetArgumentValueFloat(SlangReflectionUserAttribute* attrib, unsigned int index, float * rs) { auto userAttr = convert(attrib); - if (!userAttr) return SLANG_ERROR_INVALID_PARAMETER; - if (index >= (unsigned int)userAttr->args.getCount()) return SLANG_ERROR_INVALID_PARAMETER; + if (!userAttr) return SLANG_E_INVALID_ARG; + if (index >= (unsigned int)userAttr->args.getCount()) return SLANG_E_INVALID_ARG; if (auto cexpr = as(userAttr->args[index])) { *rs = (float)cexpr->value; return 0; } - return SLANG_ERROR_INVALID_PARAMETER; + return SLANG_E_INVALID_ARG; } SLANG_API const char* spReflectionUserAttribute_GetArgumentValueString(SlangReflectionUserAttribute* attrib, unsigned int index, size_t* bufLen) { -- cgit v1.2.3