mirror of
https://github.com/aap/librw.git
synced 2025-02-18 02:06:33 +00:00
fix 'comma at end of enumerator list [-Wpedantic]'
This commit is contained in:
parent
3edb391f9c
commit
b38cbc7961
18
src/base.err
18
src/base.err
@ -1,20 +1,20 @@
|
|||||||
ECODE(ERR_GENERAL,
|
ECODE(ERR_GENERAL,
|
||||||
"Error: %s")
|
"Error: %s"),
|
||||||
ECODE(ERR_ALLOC,
|
ECODE(ERR_ALLOC,
|
||||||
"Couldn't allocate 0x%X bytes")
|
"Couldn't allocate 0x%X bytes"),
|
||||||
ECODE(ERR_FILE,
|
ECODE(ERR_FILE,
|
||||||
"Couldn't open file %s")
|
"Couldn't open file %s"),
|
||||||
ECODE(ERR_CHUNK,
|
ECODE(ERR_CHUNK,
|
||||||
"Couldn't find chunk %s")
|
"Couldn't find chunk %s"),
|
||||||
ECODE(ERR_VERSION,
|
ECODE(ERR_VERSION,
|
||||||
"Unsupported version %X")
|
"Unsupported version %X"),
|
||||||
ECODE(ERR_PLATFORM,
|
ECODE(ERR_PLATFORM,
|
||||||
"Unsupported platform %d")
|
"Unsupported platform %d"),
|
||||||
ECODE(ERR_ENGINEINIT,
|
ECODE(ERR_ENGINEINIT,
|
||||||
"Engine could not be initialized")
|
"Engine could not be initialized"),
|
||||||
ECODE(ERR_ENGINEOPEN,
|
ECODE(ERR_ENGINEOPEN,
|
||||||
"Engine could not be opened")
|
"Engine could not be opened"),
|
||||||
ECODE(ERR_ENGINESTART,
|
ECODE(ERR_ENGINESTART,
|
||||||
"Engine could not be started")
|
"Engine could not be started"),
|
||||||
ECODE(ERR_INVRASTER,
|
ECODE(ERR_INVRASTER,
|
||||||
"Invalid raster format")
|
"Invalid raster format")
|
||||||
|
@ -110,7 +110,7 @@ enum {
|
|||||||
// 2.8 biased fixed point
|
// 2.8 biased fixed point
|
||||||
D3DFMT_A2B10G10R10_XR_BIAS = 119,
|
D3DFMT_A2B10G10R10_XR_BIAS = 119,
|
||||||
// Binary format indicating that the data has no inherent type
|
// Binary format indicating that the data has no inherent type
|
||||||
D3DFMT_BINARYBUFFER = 199,
|
D3DFMT_BINARYBUFFER = 199
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ enum {
|
|||||||
D3DDECLUSAGE_COLOR, // 10
|
D3DDECLUSAGE_COLOR, // 10
|
||||||
D3DDECLUSAGE_FOG, // 11
|
D3DDECLUSAGE_FOG, // 11
|
||||||
D3DDECLUSAGE_DEPTH, // 12
|
D3DDECLUSAGE_DEPTH, // 12
|
||||||
D3DDECLUSAGE_SAMPLE, // 13
|
D3DDECLUSAGE_SAMPLE // 13
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -184,7 +184,7 @@ enum {
|
|||||||
D3DFMT_LIN_F16 = 0x00000031,
|
D3DFMT_LIN_F16 = 0x00000031,
|
||||||
|
|
||||||
D3DFMT_VERTEXDATA = 100,
|
D3DFMT_VERTEXDATA = 100,
|
||||||
D3DFMT_INDEX16 = 101,
|
D3DFMT_INDEX16 = 101
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -189,7 +189,7 @@ registerNativeDataPlugin(void)
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
D3DPT_TRIANGLELIST = 5,
|
D3DPT_TRIANGLELIST = 5,
|
||||||
D3DPT_TRIANGLESTRIP = 6,
|
D3DPT_TRIANGLESTRIP = 6
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -23,7 +23,7 @@ getError(Error *e)
|
|||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ECODE(c, s) s,
|
#define ECODE(c, s) s
|
||||||
|
|
||||||
const char *errstrs[] = {
|
const char *errstrs[] = {
|
||||||
"No error",
|
"No error",
|
||||||
|
@ -43,7 +43,7 @@ enum AttribIndices
|
|||||||
ATTRIB_TEXCOORDS4,
|
ATTRIB_TEXCOORDS4,
|
||||||
ATTRIB_TEXCOORDS5,
|
ATTRIB_TEXCOORDS5,
|
||||||
ATTRIB_TEXCOORDS6,
|
ATTRIB_TEXCOORDS6,
|
||||||
ATTRIB_TEXCOORDS7,
|
ATTRIB_TEXCOORDS7
|
||||||
};
|
};
|
||||||
|
|
||||||
// default uniform indices
|
// default uniform indices
|
||||||
|
@ -521,7 +521,7 @@ enum {
|
|||||||
VIF_MARK = 0x07000000,
|
VIF_MARK = 0x07000000,
|
||||||
VIF_FLUSH = 0x11000000,
|
VIF_FLUSH = 0x11000000,
|
||||||
VIF_MSCALF = 0x15000000,
|
VIF_MSCALF = 0x15000000,
|
||||||
VIF_MSCNT = 0x17000000,
|
VIF_MSCNT = 0x17000000
|
||||||
};
|
};
|
||||||
|
|
||||||
struct InstMeshInfo
|
struct InstMeshInfo
|
||||||
|
@ -37,7 +37,7 @@ enum Psm {
|
|||||||
PSMZ32 = 0x30,
|
PSMZ32 = 0x30,
|
||||||
PSMZ24 = 0x31,
|
PSMZ24 = 0x31,
|
||||||
PSMZ16 = 0x32,
|
PSMZ16 = 0x32,
|
||||||
PSMZ16S = 0x3A,
|
PSMZ16S = 0x3A
|
||||||
};
|
};
|
||||||
|
|
||||||
// i don't really understand this, stolen from RW
|
// i don't really understand this, stolen from RW
|
||||||
|
@ -185,7 +185,7 @@ struct Ps2Raster
|
|||||||
enum Flags {
|
enum Flags {
|
||||||
NEWSTYLE = 0x1, // has GIF tags and transfer DMA chain
|
NEWSTYLE = 0x1, // has GIF tags and transfer DMA chain
|
||||||
SWIZZLED8 = 0x2,
|
SWIZZLED8 = 0x2,
|
||||||
SWIZZLED4 = 0x4,
|
SWIZZLED4 = 0x4
|
||||||
};
|
};
|
||||||
struct PixelPtr {
|
struct PixelPtr {
|
||||||
// RW has pixels as second element but we don't want this struct
|
// RW has pixels as second element but we don't want this struct
|
||||||
|
12
src/rwbase.h
12
src/rwbase.h
@ -269,7 +269,7 @@ enum CombineOp
|
|||||||
{
|
{
|
||||||
COMBINEREPLACE,
|
COMBINEREPLACE,
|
||||||
COMBINEPRECONCAT,
|
COMBINEPRECONCAT,
|
||||||
COMBINEPOSTCONCAT,
|
COMBINEPOSTCONCAT
|
||||||
};
|
};
|
||||||
|
|
||||||
struct RawMatrix
|
struct RawMatrix
|
||||||
@ -398,7 +398,7 @@ enum PrimitiveType
|
|||||||
PRIMTYPETRILIST,
|
PRIMTYPETRILIST,
|
||||||
PRIMTYPETRISTRIP,
|
PRIMTYPETRISTRIP,
|
||||||
PRIMTYPETRIFAN,
|
PRIMTYPETRIFAN,
|
||||||
PRIMTYPEPOINTLIST,
|
PRIMTYPEPOINTLIST
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -503,7 +503,7 @@ enum VendorID
|
|||||||
// Used for rasters (platform-specific)
|
// Used for rasters (platform-specific)
|
||||||
VEND_RASTER = 10,
|
VEND_RASTER = 10,
|
||||||
// Used for driver/device allocation tags
|
// Used for driver/device allocation tags
|
||||||
VEND_DRIVER = 11,
|
VEND_DRIVER = 11
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO: modules (VEND_CRITERIONINT)
|
// TODO: modules (VEND_CRITERIONINT)
|
||||||
@ -559,17 +559,17 @@ enum PluginID
|
|||||||
ID_RASTERGL3 = MAKEPLUGINID(VEND_RASTER, PLATFORM_GL3),
|
ID_RASTERGL3 = MAKEPLUGINID(VEND_RASTER, PLATFORM_GL3),
|
||||||
|
|
||||||
// anything driver/device related (only as allocation tag)
|
// anything driver/device related (only as allocation tag)
|
||||||
ID_DRIVER = MAKEPLUGINID(VEND_DRIVER, 0),
|
ID_DRIVER = MAKEPLUGINID(VEND_DRIVER, 0)
|
||||||
};
|
};
|
||||||
|
|
||||||
enum CoreModuleID
|
enum CoreModuleID
|
||||||
{
|
{
|
||||||
ID_NAMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x00),
|
ID_NAMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x00),
|
||||||
ID_FRAMEMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x03),
|
ID_FRAMEMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x03),
|
||||||
ID_TEXTUREMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x08),
|
ID_TEXTUREMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x08)
|
||||||
};
|
};
|
||||||
|
|
||||||
#define ECODE(c, s) c,
|
#define ECODE(c, s) c
|
||||||
|
|
||||||
enum Errors
|
enum Errors
|
||||||
{
|
{
|
||||||
|
@ -13,7 +13,7 @@ enum DeviceReq
|
|||||||
DEVICETERM,
|
DEVICETERM,
|
||||||
|
|
||||||
// Device initialization after Engine/Driver plugins are opened
|
// Device initialization after Engine/Driver plugins are opened
|
||||||
DEVICEFINALIZE,
|
DEVICEFINALIZE
|
||||||
// TODO? counterpart to FINALIZE?
|
// TODO? counterpart to FINALIZE?
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ struct Frame
|
|||||||
SUBTREESYNCOBJ = 0x08,
|
SUBTREESYNCOBJ = 0x08,
|
||||||
SUBTREESYNC = SUBTREESYNCLTM | SUBTREESYNCOBJ,
|
SUBTREESYNC = SUBTREESYNCLTM | SUBTREESYNCOBJ,
|
||||||
SYNCLTM = HIERARCHYSYNCLTM | SUBTREESYNCLTM,
|
SYNCLTM = HIERARCHYSYNCLTM | SUBTREESYNCLTM,
|
||||||
SYNCOBJ = HIERARCHYSYNCOBJ | SUBTREESYNCOBJ,
|
SYNCOBJ = HIERARCHYSYNCOBJ | SUBTREESYNCOBJ
|
||||||
// STATIC = 0x10
|
// STATIC = 0x10
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -219,7 +219,7 @@ struct Raster
|
|||||||
CAMERA = 0x02,
|
CAMERA = 0x02,
|
||||||
TEXTURE = 0x04,
|
TEXTURE = 0x04,
|
||||||
CAMERATEXTURE = 0x05,
|
CAMERATEXTURE = 0x05,
|
||||||
DONTALLOCATE = 0x80,
|
DONTALLOCATE = 0x80
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -451,7 +451,7 @@ struct Atomic
|
|||||||
// private flags
|
// private flags
|
||||||
WORLDBOUNDDIRTY = 0x01,
|
WORLDBOUNDDIRTY = 0x01,
|
||||||
// for setGeometry
|
// for setGeometry
|
||||||
SAMEBOUNDINGSPHERE = 0x01,
|
SAMEBOUNDINGSPHERE = 0x01
|
||||||
};
|
};
|
||||||
|
|
||||||
ObjectWithFrame object;
|
ObjectWithFrame object;
|
||||||
@ -541,7 +541,7 @@ struct Light
|
|||||||
AMBIENT,
|
AMBIENT,
|
||||||
POINT = 0x80, // positioned
|
POINT = 0x80, // positioned
|
||||||
SPOT,
|
SPOT,
|
||||||
SOFTSPOT,
|
SOFTSPOT
|
||||||
};
|
};
|
||||||
enum Flags {
|
enum Flags {
|
||||||
LIGHTATOMICS = 1,
|
LIGHTATOMICS = 1,
|
||||||
|
@ -24,7 +24,7 @@ enum RenderState
|
|||||||
|
|
||||||
// platform specific or opaque?
|
// platform specific or opaque?
|
||||||
ALPHATESTFUNC,
|
ALPHATESTFUNC,
|
||||||
ALPHATESTREF,
|
ALPHATESTREF
|
||||||
};
|
};
|
||||||
|
|
||||||
enum AlphaTestFunc
|
enum AlphaTestFunc
|
||||||
@ -53,7 +53,7 @@ enum BlendFunction
|
|||||||
BLENDINVDESTALPHA,
|
BLENDINVDESTALPHA,
|
||||||
BLENDDESTCOLOR,
|
BLENDDESTCOLOR,
|
||||||
BLENDINVDESTCOLOR,
|
BLENDINVDESTCOLOR,
|
||||||
BLENDSRCALPHASAT,
|
BLENDSRCALPHASAT
|
||||||
// TODO: add more perhaps
|
// TODO: add more perhaps
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ enum UserDataType
|
|||||||
USERDATANA = 0,
|
USERDATANA = 0,
|
||||||
USERDATAINT = 1,
|
USERDATAINT = 1,
|
||||||
USERDATAFLOAT = 2,
|
USERDATAFLOAT = 2,
|
||||||
USERDATASTRING = 3,
|
USERDATASTRING = 3
|
||||||
};
|
};
|
||||||
|
|
||||||
struct UserDataArray
|
struct UserDataArray
|
||||||
|
Loading…
x
Reference in New Issue
Block a user