swr/rast: Support flexible vertex layout for DS output

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>

diff --git a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
index 211e9e4b073d7f685641f570815382577247a3ed..e15b300979661dc6d1dff2f913c54efcf2b63923 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
@@ -1237,6 +1237,7 @@ static void TessellationStages(
         dsContext.pDomainU = (simdscalar*)tsData.pDomainPointsU;
         dsContext.pDomainV = (simdscalar*)tsData.pDomainPointsV;
         dsContext.pOutputData = gt_pTessellationThreadData->pDSOutput;
+        dsContext.outVertexAttribOffset = tsState.dsOutVtxAttribOffset;
 #if USE_SIMD16_FRONTEND
         dsContext.vectorStride = RoundUpEven(requiredDSVectorInvocations);      // simd8 -> simd16
 #else

diff --git a/src/gallium/drivers/swr/rasterizer/core/state.h b/src/gallium/drivers/swr/rasterizer/core/state.h
index 2af384fd9072cf8a440c7222043eadeb9bb60d05..d11ffc69b016746d22b34dc41e80ab43dff08eb9 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/core/state.h
+++ b/src/gallium/drivers/swr/rasterizer/core/state.h
@@ -288,6 +288,7 @@ struct SWR_DS_CONTEXT
     uint32_t        PrimitiveID;    // IN: (SCALAR) PrimitiveID for the patch associated with the DS invocation
     uint32_t        vectorOffset;   // IN: (SCALAR) vector index offset into SIMD data.
     uint32_t        vectorStride;   // IN: (SCALAR) stride (in vectors) of output data per attribute-component
+    uint32_t        outVertexAttribOffset; // IN: (SCALAR) Offset to the attributes as processed by the next shader stage.
     ScalarPatch*    pCpIn;          // IN: (SCALAR) Control patch
     simdscalar*     pDomainU;       // IN: (SIMD) Domain Point U coords
     simdscalar*     pDomainV;       // IN: (SIMD) Domain Point V coords
@@ -819,6 +820,7 @@ struct SWR_TS_STATE
     uint32_t                numHsOutputAttribs;
     uint32_t                numDsOutputAttribs;
     uint32_t                dsAllocationSize;
+    uint32_t                dsOutVtxAttribOffset;
 
     // Offset to the start of the attributes of the input vertices, in simdvector units
     uint32_t                vertexAttribOffset;