artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

shader: Simplify code in opcodes.h to fix Intellisense

Browse source 
Avoid using std::array to fix Intellisense not properly compiling this
code and disabling itself on all files that include it.

While we are at it, change the code to use u8 instead of size_t for the
number of instructions in an opcode.
This commit is contained in:
ReinUsesLisp 2021-04-22 16:18:54 -03:00 committed by ameerj
parent d10cf55353
commit 21e3382830
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/shader_recompiler/frontend/ir/opcodes.h
View file

@ -4,8 +4,8 @@
#pragma once #pragma once
#include <array>
#include <algorithm> #include <algorithm>
#include <array>
#include <string_view> #include <string_view>
#include <fmt/format.h> #include <fmt/format.h>
@ -21,7 +21,6 @@ enum class Opcode {
}; };
namespace Detail { namespace Detail {
struct OpcodeMeta { struct OpcodeMeta {
std::string_view name; std::string_view name;
Type type; Type type;
@ -57,9 +56,9 @@ constexpr Type F64x2{Type::F64x2};
constexpr Type F64x3{Type::F64x3}; constexpr Type F64x3{Type::F64x3};
constexpr Type F64x4{Type::F64x4}; constexpr Type F64x4{Type::F64x4};
constexpr std::array META_TABLE{ constexpr OpcodeMeta META_TABLE[]{
#define OPCODE(name_token, type_token, ...) \ #define OPCODE(name_token, type_token, ...) \
OpcodeMeta{ \ { \
.name{#name_token}, \ .name{#name_token}, \
.type = type_token, \ .type = type_token, \
.arg_types{__VA_ARGS__}, \ .arg_types{__VA_ARGS__}, \
@ -67,14 +66,13 @@ constexpr std::array META_TABLE{
#include "opcodes.inc" #include "opcodes.inc"
#undef OPCODE #undef OPCODE
}; };
constexpr size_t CalculateNumArgsOf(Opcode op) { constexpr size_t CalculateNumArgsOf(Opcode op) {
const auto& arg_types{META_TABLE[static_cast<size_t>(op)].arg_types}; const auto& arg_types{META_TABLE[static_cast<size_t>(op)].arg_types};
return std::distance(arg_types.begin(), std::ranges::find(arg_types, Type::Void)); return std::distance(arg_types.begin(), std::ranges::find(arg_types, Type::Void));
} }
constexpr std::array NUM_ARGS{ constexpr u8 NUM_ARGS[]{
#define OPCODE(name_token, type_token, ...) CalculateNumArgsOf(Opcode::name_token), #define OPCODE(name_token, type_token, ...) static_cast<u8>(CalculateNumArgsOf(Opcode::name_token)),
#include "opcodes.inc" #include "opcodes.inc"
#undef OPCODE #undef OPCODE
}; };
@ -87,7 +85,7 @@ constexpr std::array NUM_ARGS{
/// Get the number of arguments an opcode accepts /// Get the number of arguments an opcode accepts
[[nodiscard]] inline size_t NumArgsOf(Opcode op) noexcept { [[nodiscard]] inline size_t NumArgsOf(Opcode op) noexcept {
return Detail::NUM_ARGS[static_cast<size_t>(op)]; return static_cast<size_t>(Detail::NUM_ARGS[static_cast<size_t>(op)]);
} }
/// Get the required type of an argument of an opcode /// Get the required type of an argument of an opcode