fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swr/rast: Fetch compile state changes

Browse source 
Add InstanceStrideEnable field and rename InstanceDataStepRate to
InstanceAdvancementState in INPUT_ELEMENT_DESC structure.

Add stubs for handling InstanceStrideEnable in FetchJit::JitLoadVertices()
and FetchJit::JitGatherVertices() and assert if they are triggered.

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
Tim Rowley 2017-09-07 18:53:03 -05:00
parent ead0dfe31e
commit 000e2958f5
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
View file

@ -360,7 +360,7 @@ void FetchJit::JitLoadVertices(const FETCH_COMPILE_STATE &fetchState, Value* str
Value *startOffset;
if(ied.InstanceEnable)
{
Value* stepRate = C(ied.InstanceDataStepRate);
Value* stepRate = C(ied.InstanceAdvancementState);
// prevent a div by 0 for 0 step rate
Value* isNonZeroStep = ICMP_UGT(stepRate, C(0));
@ -376,6 +376,10 @@ void FetchJit::JitLoadVertices(const FETCH_COMPILE_STATE &fetchState, Value* str
startOffset = startInstance;
}
else if (ied.InstanceStrideEnable)
{
SWR_ASSERT((0), "TODO: Fill out more once driver sends this down.");
}
else
{
// offset indices by baseVertex
@ -825,7 +829,7 @@ void FetchJit::JitGatherVertices(const FETCH_COMPILE_STATE &fetchState,
Value *startOffset;
if(ied.InstanceEnable)
{
Value* stepRate = C(ied.InstanceDataStepRate);
Value* stepRate = C(ied.InstanceAdvancementState);
// prevent a div by 0 for 0 step rate
Value* isNonZeroStep = ICMP_UGT(stepRate, C(0));
@ -841,6 +845,10 @@ void FetchJit::JitGatherVertices(const FETCH_COMPILE_STATE &fetchState,
startOffset = startInstance;
}
else if (ied.InstanceStrideEnable)
{
SWR_ASSERT((0), "TODO: Fill out more once driver sends this down.");
}
else
{
// offset indices by baseVertex

7
src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.h
View file

@ -45,16 +45,17 @@ struct INPUT_ELEMENT_DESC
uint32_t Format : 10;
uint32_t StreamIndex : 6;
uint32_t InstanceEnable : 1;
uint32_t InstanceStrideEnable : 1;
uint32_t ComponentControl0 : 3;
uint32_t ComponentControl1 : 3;
uint32_t ComponentControl2 : 3;
uint32_t ComponentControl3 : 3;
uint32_t ComponentPacking : 4;
uint32_t _reserved : 19;
uint32_t _reserved : 18;
};
uint64_t bits;
};
uint32_t InstanceDataStepRate;
uint32_t InstanceAdvancementState;
};
// used to set ComponentPacking
@ -124,7 +125,7 @@ struct FETCH_COMPILE_STATE
{
if((layout[i].bits != other.layout[i].bits) ||
((layout[i].InstanceEnable == 1) &&
(layout[i].InstanceDataStepRate != other.layout[i].InstanceDataStepRate))){
(layout[i].InstanceAdvancementState != other.layout[i].InstanceAdvancementState))){
return false;
}
}

2
src/gallium/drivers/swr/swr_state.cpp
View file

@ -531,7 +531,7 @@ swr_create_vertex_elements_state(struct pipe_context *pipe,
? ComponentControl::StoreSrc
: ComponentControl::Store1Fp;
velems->fsState.layout[i].ComponentPacking = ComponentEnable::XYZW;
velems->fsState.layout[i].InstanceDataStepRate =
velems->fsState.layout[i].InstanceAdvancementState =
attribs[i].instance_divisor;
/* Calculate the pitch of each stream */