ZoneCode: Fix Commands for Material, GfxImage and Techset

This commit is contained in:
Jan 2019-12-23 17:03:16 +01:00
parent db08cf5ebc
commit 8d8f60bf41
2 changed files with 8 additions and 7 deletions

View File

@ -294,9 +294,9 @@ set count stateBitsTable stateBitsCount;
// GfxStateBits
use GfxStateBits;
set count blendState 0;
set count depthStencilState 0;
set count rasterizerState 0;
set condition blendState never;
set condition depthStencilState never;
set condition rasterizerState never;
// =========================================
// MaterialTechniqueSet
@ -327,13 +327,13 @@ reorder:
args;
// MaterialVertexStreamRouting
set count MaterialVertexStreamRouting::decl 0;
set condition MaterialVertexStreamRouting::decl never;
// MaterialVertexShader
set string MaterialVertexShader::name;
// MaterialVertexShaderProgram
set count MaterialVertexShaderProgram::vs 0;
set condition MaterialVertexShaderProgram::vs never;
// GfxVertexShaderLoadDef
set count GfxVertexShaderLoadDef::program programSize;
@ -342,7 +342,7 @@ set count GfxVertexShaderLoadDef::program programSize;
set string MaterialPixelShader::name;
// MaterialPixelShaderProgram
set count MaterialPixelShaderProgram::ps 0;
set condition MaterialPixelShaderProgram::ps never;
// GfxPixelShaderLoadDef
set count GfxPixelShaderLoadDef::program programSize;
@ -359,6 +359,7 @@ set reusable u::literalConst;
use GfxImage;
set string name;
set name name;
set condition pixels never;
reorder:
name
texture;

View File

@ -2664,7 +2664,7 @@ namespace T6
};
struct MaterialConstantDef
struct __declspec(align(16)) MaterialConstantDef
{
unsigned int nameHash;
char name[12];