Fix compilation

This commit is contained in:
Pavel 2024-02-27 12:57:19 +03:00
parent 566abbaf61
commit ae897da738
14 changed files with 42 additions and 40 deletions

View File

@ -15,9 +15,10 @@ uses
type type
PsrCacheOp=^TsrCacheOp; PsrCacheOp=^TsrCacheOp;
TsrCacheOp=object TsrCacheOp=object
private public
pLeft,pRight:PsrCacheOp; pLeft,pRight:PsrCacheOp;
//---- function c(n1,n2:PsrCacheOp):Integer; static;
private
key:packed record key:packed record
place:PsrOpBlock; place:PsrOpBlock;
OpId:DWORD; OpId:DWORD;
@ -25,7 +26,6 @@ type
count:DWORD; count:DWORD;
end; end;
pData:PPsrRegNode; pData:PPsrRegNode;
function c(n1,n2:PsrCacheOp):Integer; static;
public public
pDst:PsrNode; pDst:PsrNode;
end; end;

View File

@ -32,15 +32,15 @@ type
PPsrConst=^PsrConst; PPsrConst=^PsrConst;
PsrConst=^TsrConst; PsrConst=^TsrConst;
TsrConst=packed object(TsrNode) TsrConst=packed object(TsrNode)
private public
pPrev,pNext,pLeft,pRight:PsrConst; pPrev,pNext,pLeft,pRight:PsrConst;
//-- function c(n1,n2:PsrConst):Integer; static;
private
ID:TsrRefId; //post id ID:TsrRefId; //post id
fOpId:WORD; fOpId:WORD;
fCount:WORD; fCount:WORD;
FType:PsrType; FType:PsrType;
pData:PPsrNode; pData:PPsrNode;
function c(n1,n2:PsrConst):Integer; static;
public public
property pType:PsrType read FType; property pType:PsrType read FType;
property OpId:WORD read fOpId; property OpId:WORD read fOpId;

View File

@ -19,14 +19,14 @@ type
PsrDecorate=^TsrDecorate; PsrDecorate=^TsrDecorate;
TsrDecorate=object TsrDecorate=object
private public
pLeft,pRight:PsrDecorate; pLeft,pRight:PsrDecorate;
//---- function c(n1,n2:PsrDecorate):Integer; static;
private
key:packed record key:packed record
data:PsrNode; data:PsrNode;
param:array[0..2] of DWORD; param:array[0..2] of DWORD;
end; end;
function c(n1,n2:PsrDecorate):Integer; static;
public public
node:PSpirvOp; node:PSpirvOp;
end; end;

View File

@ -33,11 +33,11 @@ type
PsrFragLayout=^TsrFragLayout; PsrFragLayout=^TsrFragLayout;
TsrFragLayout=object(TsrDescriptor) TsrFragLayout=object(TsrDescriptor)
private public
pLeft,pRight:PsrFragLayout; pLeft,pRight:PsrFragLayout;
//----
itype:TpsslInputType;
function c(n1,n2:PsrFragLayout):Integer; static; function c(n1,n2:PsrFragLayout):Integer; static;
private
itype:TpsslInputType;
public public
pReg:PsrRegNode; pReg:PsrRegNode;
Procedure Init; inline; Procedure Init; inline;

View File

@ -69,14 +69,14 @@ type
PsrInput=^TsrInput; PsrInput=^TsrInput;
TsrInput=object(TsrDescriptor) TsrInput=object(TsrDescriptor)
private public
pLeft,pRight:PsrInput; pLeft,pRight:PsrInput;
//---- function c(n1,n2:PsrInput):Integer; static;
private
key:packed record key:packed record
itype:TpsslInputType; itype:TpsslInputType;
typeid:Byte; typeid:Byte;
end; end;
function c(n1,n2:PsrInput):Integer; static;
public public
pReg:PsrRegNode; pReg:PsrRegNode;
property itype:TpsslInputType read key.itype; property itype:TpsslInputType read key.itype;

View File

@ -73,9 +73,10 @@ type
pLine:PspirvOp; pLine:PspirvOp;
end; end;
TNodeList=specialize TNodeList<PVNode>; TNodeList=specialize TNodeList<PVNode>;
private public
pLeft,pRight:PsrChain; pLeft,pRight:PsrChain;
//-- function c(n1,n2:PsrChain):Integer; static;
private
fwrite_count:DWORD; fwrite_count:DWORD;
//-- //--
ID:TsrRefId; //post id ID:TsrRefId; //post id
@ -88,7 +89,6 @@ type
FWriter:PsrNode; FWriter:PsrNode;
Fdtype:TsrDataType; Fdtype:TsrDataType;
FList:TNodeList; FList:TNodeList;
function c(n1,n2:PsrChain):Integer; static;
Procedure SetWriter(t:PsrNode); Procedure SetWriter(t:PsrNode);
Function GetWriter:PsrNode; Function GetWriter:PsrNode;
Procedure SetBuffer(t:PsrNode); Procedure SetBuffer(t:PsrNode);

View File

@ -29,7 +29,7 @@ type
PsrLiteral=^TsrLiteral; PsrLiteral=^TsrLiteral;
TsrLiteral=object(TsrNode) TsrLiteral=object(TsrNode)
private public
pLeft,pRight:PsrLiteral; pLeft,pRight:PsrLiteral;
public public
dtype:TsrDataType; dtype:TsrDataType;

View File

@ -50,8 +50,9 @@ type
POpParamNode=^TOpParamNode; POpParamNode=^TOpParamNode;
TOpParamNode=packed object TOpParamNode=packed object
private public
pNext:POpParamNode; pNext:POpParamNode;
private
pParent:PspirvOp; pParent:PspirvOp;
pValue:PsrNode; pValue:PsrNode;
procedure SetValue(v:PsrNode); procedure SetValue(v:PsrNode);
@ -69,8 +70,9 @@ type
PsrOpCustom=^TsrOpCustom; PsrOpCustom=^TsrOpCustom;
TsrOpCustom=object(TsrNode) TsrOpCustom=object(TsrNode)
private public
pPrev,pNext:PsrOpCustom; pPrev,pNext:PsrOpCustom;
private
pParent:PsrOpBlock; pParent:PsrOpBlock;
end; end;
@ -181,14 +183,14 @@ type
PSpirvFunc=^TSpirvFunc; PSpirvFunc=^TSpirvFunc;
TSpirvFunc=object(TsrNode) TSpirvFunc=object(TsrNode)
private public
pPrev,pNext,pLeft,pRight:PSpirvFunc; pPrev,pNext,pLeft,pRight:PSpirvFunc;
//---- function c(n1,n2:PSpirvFunc):Integer; static;
private
FName:RawByteString; FName:RawByteString;
FTop:TsrOpBlock; FTop:TsrOpBlock;
FBlock:PsrOpBlock; FBlock:PsrOpBlock;
ID:TsrRefId; //post id ID:TsrRefId; //post id
function c(n1,n2:PSpirvFunc):Integer; static;
public public
property Name:RawByteString read FName; property Name:RawByteString read FName;
property pBlock:PsrOpBlock read FBlock; property pBlock:PsrOpBlock read FBlock;

View File

@ -66,16 +66,16 @@ type
end; end;
TNodeList=specialize TNodeList<PVNode>; TNodeList=specialize TNodeList<PVNode>;
TVoltList=specialize TNodeList<PsrVolatile>; TVoltList=specialize TNodeList<PsrVolatile>;
private public
pLeft,pRight:PsrPrivate; pLeft,pRight:PsrPrivate;
//---- function c(n1,n2:PsrPrivate):Integer; static;
private
fwrite_count:DWORD; fwrite_count:DWORD;
// //
FSource:PsrRegSlot; FSource:PsrRegSlot;
// //
FLineList:TNodeList; FLineList:TNodeList;
FVoltList:TVoltList; FVoltList:TVoltList;
function c(n1,n2:PsrPrivate):Integer; static;
Procedure SetRegType(rtype:TsrDataType); Procedure SetRegType(rtype:TsrDataType);
function GetRegType:TsrDataType; function GetRegType:TsrDataType;
public public

View File

@ -46,9 +46,9 @@ type
TRegDNodeList=specialize TNodeStack<PRegDNode>; TRegDNodeList=specialize TNodeStack<PRegDNode>;
TsrRegNode=packed object(TsrNode) TsrRegNode=packed object(TsrNode)
private public
pPrev,pNext:PsrRegNode; pPrev,pNext:PsrRegNode;
// private
ID:TsrRefId; //post id ID:TsrRefId; //post id
F:bitpacked record F:bitpacked record
dtype:TsrDataType; dtype:TsrDataType;

View File

@ -26,16 +26,16 @@ type
PPsrType=^PsrType; PPsrType=^PsrType;
PsrType=^TsrType; PsrType=^TsrType;
TsrType=packed object(TsrNode) TsrType=packed object(TsrNode)
private public
pPrev,pNext,pLeft,pRight:PsrType; pPrev,pNext,pLeft,pRight:PsrType;
// function c(n1,n2:PsrType):Integer; static;
private
ID:TsrRefId; //post id ID:TsrRefId; //post id
fdtype:TsrDataType; fdtype:TsrDataType;
fsize:DWORD; fsize:DWORD;
fOpId:WORD; fOpId:WORD;
fcount:WORD; fcount:WORD;
pData:PPsrNode; pData:PPsrNode;
function c(n1,n2:PsrType):Integer; static;
public public
property size:DWORD read fsize; property size:DWORD read fsize;
property OpId:WORD read fOpId; property OpId:WORD read fOpId;

View File

@ -52,15 +52,15 @@ type
PsrUniform=^TsrUniform; PsrUniform=^TsrUniform;
TsrUniform=object(TsrDescriptor) TsrUniform=object(TsrDescriptor)
private public
pLeft,pRight:PsrUniform; pLeft,pRight:PsrUniform;
//---- function c(n1,n2:PsrUniform):Integer; static;
private
pLayout:PsrDataLayout; pLayout:PsrDataLayout;
// //
fwrite_count:DWORD; fwrite_count:DWORD;
// //
FReg:TsrRegUniform; FReg:TsrRegUniform;
function c(n1,n2:PsrUniform):Integer; static;
public public
Procedure Init; inline; Procedure Init; inline;
function pReg:PsrRegUniform; inline; function pReg:PsrRegUniform; inline;

View File

@ -30,9 +30,9 @@ type
PsrVariable=^TsrVariable; PsrVariable=^TsrVariable;
TsrVariable=packed object(TsrNode) TsrVariable=packed object(TsrNode)
private public
pPrev,pNext:PsrVariable; pPrev,pNext:PsrVariable;
// private
fwrite_count:DWORD; fwrite_count:DWORD;
ID:TsrRefId; //post id ID:TsrRefId; //post id
FType:PsrType; FType:PsrType;

View File

@ -23,11 +23,11 @@ type
PsrVertLayout=^TsrVertLayout; PsrVertLayout=^TsrVertLayout;
TsrVertLayout=object(TsrDescriptor) TsrVertLayout=object(TsrDescriptor)
private public
pLeft,pRight:PsrVertLayout; pLeft,pRight:PsrVertLayout;
//----
pLayout:PsrDataLayout;
function c(n1,n2:PsrVertLayout):Integer; static; function c(n1,n2:PsrVertLayout):Integer; static;
private
pLayout:PsrDataLayout;
public public
pReg:PsrRegNode; pReg:PsrRegNode;
procedure Init(p:PsrDataLayout); inline; procedure Init(p:PsrDataLayout); inline;