Change routine names to be strings of char Routine names were passed as wide strings for the integration with CodeAnalyst, which no longer exists. - Rip out the remnants of the CodeAnalyst support - Change Reactor interface to take routine names as const char * Bug: b/123193048 Change-Id: I919ce3a55c59c3a08057f85cac994fbffad37614 Reviewed-on: https://swiftshader-review.googlesource.com/c/23908 Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Chris Forbes <chrisforbes@google.com>
diff --git a/src/Reactor/Reactor.hpp b/src/Reactor/Reactor.hpp index fe4cf1d..db4d5f8 100644 --- a/src/Reactor/Reactor.hpp +++ b/src/Reactor/Reactor.hpp
@@ -20,7 +20,7 @@ #include <cassert> #include <cstddef> -#include <cwchar> +#include <cstdio> #undef Bool namespace rr @@ -2257,7 +2257,7 @@ return Argument<typename ArgI<index, Arguments...>::Type>(arg); } - Routine *operator()(const wchar_t *name, ...); + Routine *operator()(const char *name, ...); protected: Nucleus *core; @@ -2757,13 +2757,13 @@ } template<typename Return, typename... Arguments> - Routine *Function<Return(Arguments...)>::operator()(const wchar_t *name, ...) + Routine *Function<Return(Arguments...)>::operator()(const char *name, ...) { - wchar_t fullName[1024 + 1]; + char fullName[1024 + 1]; va_list vararg; va_start(vararg, name); - vswprintf(fullName, 1024, name, vararg); + vsnprintf(fullName, 1024, name, vararg); va_end(vararg); return core->acquireRoutine(fullName, true);