ZoneCommon: Minor fixes to T6 structures

This commit is contained in:
Jan 2019-11-14 14:55:18 +01:00
parent b59ca3b261
commit 60565da607

View File

@ -3,6 +3,9 @@
#define __int32 int #define __int32 int
#define __int64 long long #define __int64 long long
typedef __declspec(align(32)) char byte32;
typedef __declspec(align(16)) char char16;
struct dvar_t; struct dvar_t;
struct MenuCell; struct MenuCell;
struct cplane_s; struct cplane_s;
@ -1736,7 +1739,7 @@ struct RawFile
{ {
const char *name; const char *name;
int len; int len;
const char *buffer; const char16* buffer;
}; };
struct StringTable struct StringTable
@ -2309,7 +2312,7 @@ struct Qdb
{ {
const char *name; const char *name;
int len; int len;
char *buffer; byte32 *buffer;
}; };
struct Slug struct Slug
@ -4944,12 +4947,27 @@ struct MaterialArgumentCodeConst
union MaterialArgumentDef union MaterialArgumentDef
{ {
/*const*/ float *literalConst; const float (*literalConst)[4];
MaterialArgumentCodeConst codeConst; MaterialArgumentCodeConst codeConst;
unsigned int codeSampler; unsigned int codeSampler;
unsigned int nameHash; unsigned int nameHash;
}; };
enum MaterialShaderArgumentType
{
MTL_ARG_MATERIAL_VERTEX_CONST = 0x0,
MTL_ARG_LITERAL_VERTEX_CONST = 0x1,
MTL_ARG_MATERIAL_PIXEL_SAMPLER = 0x2,
MTL_ARG_CODE_PRIM_BEGIN = 0x3,
MTL_ARG_CODE_VERTEX_CONST = 0x3,
MTL_ARG_CODE_PIXEL_SAMPLER = 0x4,
MTL_ARG_CODE_PIXEL_CONST = 0x5,
MTL_ARG_CODE_PRIM_END = 0x6,
MTL_ARG_MATERIAL_PIXEL_CONST = 0x6,
MTL_ARG_LITERAL_PIXEL_CONST = 0x7,
MLT_ARG_COUNT = 0x8,
};
struct MaterialShaderArgument struct MaterialShaderArgument
{ {
unsigned __int16 type; unsigned __int16 type;