Remove duplication of INSERT_PADDING_WORDS between pica.h and gpu.h
This commit is contained in:
parent
49f94b82b4
commit
302f0b32f5
|
@ -38,9 +38,8 @@ template<> struct CompileTimeAssert<true> {};
|
|||
// helper macro to properly align structure members.
|
||||
// Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121",
|
||||
// depending on the current source line to make sure variable names are unique.
|
||||
#define INSERT_PADDING_BYTES_HELPER1(x, y) x ## y
|
||||
#define INSERT_PADDING_BYTES_HELPER2(x, y) INSERT_PADDING_BYTES_HELPER1(x, y)
|
||||
#define INSERT_PADDING_BYTES(num_words) u8 INSERT_PADDING_BYTES_HELPER2(pad, __LINE__)[(num_words)]
|
||||
#define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)]
|
||||
#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)]
|
||||
|
||||
#ifndef _MSC_VER
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "common/hash.h"
|
||||
#if _M_SSE >= 0x402
|
||||
|
|
|
@ -34,13 +34,6 @@ namespace GPU {
|
|||
// MMIO region 0x1EFxxxxx
|
||||
struct Regs {
|
||||
|
||||
// helper macro to properly align structure members.
|
||||
// Calling INSERT_PADDING_WORDS will add a new member variable with a name like "pad121",
|
||||
// depending on the current source line to make sure variable names are unique.
|
||||
#define INSERT_PADDING_WORDS_HELPER1(x, y) x ## y
|
||||
#define INSERT_PADDING_WORDS_HELPER2(x, y) INSERT_PADDING_WORDS_HELPER1(x, y)
|
||||
#define INSERT_PADDING_WORDS(num_words) u32 INSERT_PADDING_WORDS_HELPER2(pad, __LINE__)[(num_words)]
|
||||
|
||||
// helper macro to make sure the defined structures are of the expected size.
|
||||
#if defined(_MSC_VER)
|
||||
// TODO: MSVC does not support using sizeof() on non-static data members even though this
|
||||
|
@ -238,10 +231,6 @@ struct Regs {
|
|||
|
||||
INSERT_PADDING_WORDS(0x9c3);
|
||||
|
||||
#undef INSERT_PADDING_WORDS_HELPER1
|
||||
#undef INSERT_PADDING_WORDS_HELPER2
|
||||
#undef INSERT_PADDING_WORDS
|
||||
|
||||
static inline size_t NumIds() {
|
||||
return sizeof(Regs) / sizeof(u32);
|
||||
}
|
||||
|
|
|
@ -39,13 +39,6 @@ namespace Pica {
|
|||
|
||||
struct Regs {
|
||||
|
||||
// helper macro to properly align structure members.
|
||||
// Calling INSERT_PADDING_WORDS will add a new member variable with a name like "pad121",
|
||||
// depending on the current source line to make sure variable names are unique.
|
||||
#define INSERT_PADDING_WORDS_HELPER1(x, y) x ## y
|
||||
#define INSERT_PADDING_WORDS_HELPER2(x, y) INSERT_PADDING_WORDS_HELPER1(x, y)
|
||||
#define INSERT_PADDING_WORDS(num_words) u32 INSERT_PADDING_WORDS_HELPER2(pad, __LINE__)[(num_words)];
|
||||
|
||||
INSERT_PADDING_WORDS(0x10);
|
||||
|
||||
u32 trigger_irq;
|
||||
|
@ -709,10 +702,6 @@ struct Regs {
|
|||
|
||||
INSERT_PADDING_WORDS(0x22);
|
||||
|
||||
#undef INSERT_PADDING_WORDS_HELPER1
|
||||
#undef INSERT_PADDING_WORDS_HELPER2
|
||||
#undef INSERT_PADDING_WORDS
|
||||
|
||||
// Map register indices to names readable by humans
|
||||
// Used for debugging purposes, so performance is not an issue here
|
||||
static std::string GetCommandName(int index) {
|
||||
|
|
Reference in New Issue