Fixes render target read access from pixel shaders.
---
.../drivers/swr/rasterizer/core/backend_sample.cpp | 15 +++++++--------
.../drivers/swr/rasterizer/core/backend_singlesample.cpp | 15 +++++++--------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/gallium/drivers/swr/rasterizer/core/backend_sample.cpp
b/src/gallium/drivers/swr/rasterizer/core/backend_sample.cpp
index 0f75ec2..2dca5d8 100644
--- a/src/gallium/drivers/swr/rasterizer/core/backend_sample.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/backend_sample.cpp
@@ -50,13 +50,13 @@ void BackendSampleRate(DRAW_CONTEXT *pDC, uint32_t
workerId, uint32_t x, uint32_
BarycentricCoeffs coeffs;
SetupBarycentricCoeffs(&coeffs, work);
- uint8_t *pColorBuffer[SWR_NUM_RENDERTARGETS], *pDepthBuffer,
*pStencilBuffer;
- SetupRenderBuffers(pColorBuffer, &pDepthBuffer, &pStencilBuffer,
state.psState.numRenderTargets, renderBuffers);
-
SWR_PS_CONTEXT psContext;
const SWR_MULTISAMPLE_POS& samplePos = state.rastState.samplePositions;
SetupPixelShaderContext<T>(&psContext, samplePos, work);
+ uint8_t *pDepthBuffer, *pStencilBuffer;
+ SetupRenderBuffers(psContext.pColorBuffer, &pDepthBuffer, &pStencilBuffer,
state.psState.numRenderTargets, renderBuffers);
+
AR_END(BESetup, 0);
psContext.vY.UL = _simd_add_ps(vULOffsetsY,
_simd_set1_ps(static_cast<float>(y)));
@@ -75,7 +75,6 @@ void BackendSampleRate(DRAW_CONTEXT *pDC, uint32_t workerId,
uint32_t x, uint32_
{
#if USE_8x2_TILE_BACKEND
const bool useAlternateOffset = ((xx & SIMD_TILE_X_DIM) != 0);
-
#endif
if (T::InputCoverage != SWR_INPUT_COVERAGE_NONE)
{
@@ -199,9 +198,9 @@ void BackendSampleRate(DRAW_CONTEXT *pDC, uint32_t
workerId, uint32_t x, uint32_
// output merger
AR_BEGIN(BEOutputMerger, pDC->drawId);
#if USE_8x2_TILE_BACKEND
- OutputMerger8x2(psContext, pColorBuffer, sample,
&state.blendState, state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets, state.colorHottileEnable, useAlternateOffset);
+ OutputMerger8x2(psContext, psContext.pColorBuffer, sample,
&state.blendState, state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets, state.colorHottileEnable, useAlternateOffset);
#else
- OutputMerger4x2(psContext, pColorBuffer, sample,
&state.blendState, state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets);
+ OutputMerger4x2(psContext, psContext.pColorBuffer, sample,
&state.blendState, state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets);
#endif
// do final depth write after all pixel kills
@@ -230,13 +229,13 @@ void BackendSampleRate(DRAW_CONTEXT *pDC, uint32_t
workerId, uint32_t x, uint32_
{
for (uint32_t rt = 0; rt < state.psState.numRenderTargets;
++rt)
{
- pColorBuffer[rt] += (2 * KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
+ psContext.pColorBuffer[rt] += (2 * KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
}
}
#else
for (uint32_t rt = 0; rt < state.psState.numRenderTargets; ++rt)
{
- pColorBuffer[rt] += (KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
+ psContext.pColorBuffer[rt] += (KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
}
#endif
pDepthBuffer += (KNOB_SIMD_WIDTH *
FormatTraits<KNOB_DEPTH_HOT_TILE_FORMAT>::bpp) / 8;
diff --git a/src/gallium/drivers/swr/rasterizer/core/backend_singlesample.cpp
b/src/gallium/drivers/swr/rasterizer/core/backend_singlesample.cpp
index 0eecc25..8ae2cf4 100644
--- a/src/gallium/drivers/swr/rasterizer/core/backend_singlesample.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/backend_singlesample.cpp
@@ -50,13 +50,13 @@ void BackendSingleSample(DRAW_CONTEXT *pDC, uint32_t
workerId, uint32_t x, uint3
BarycentricCoeffs coeffs;
SetupBarycentricCoeffs(&coeffs, work);
- uint8_t *pColorBuffer[SWR_NUM_RENDERTARGETS], *pDepthBuffer,
*pStencilBuffer;
- SetupRenderBuffers(pColorBuffer, &pDepthBuffer, &pStencilBuffer,
state.psState.numRenderTargets, renderBuffers);
-
SWR_PS_CONTEXT psContext;
const SWR_MULTISAMPLE_POS& samplePos = state.rastState.samplePositions;
SetupPixelShaderContext<T>(&psContext, samplePos, work);
+ uint8_t *pDepthBuffer, *pStencilBuffer;
+ SetupRenderBuffers(psContext.pColorBuffer, &pDepthBuffer, &pStencilBuffer,
state.psState.numRenderTargets, renderBuffers);
+
AR_END(BESetup, 1);
psContext.vY.UL = _simd_add_ps(vULOffsetsY,
_simd_set1_ps(static_cast<float>(y)));
@@ -75,7 +75,6 @@ void BackendSingleSample(DRAW_CONTEXT *pDC, uint32_t
workerId, uint32_t x, uint3
{
#if USE_8x2_TILE_BACKEND
const bool useAlternateOffset = ((xx & SIMD_TILE_X_DIM) != 0);
-
#endif
simdmask coverageMask = work.coverageMask[0] & MASK;
@@ -184,9 +183,9 @@ void BackendSingleSample(DRAW_CONTEXT *pDC, uint32_t
workerId, uint32_t x, uint3
// output merger
AR_BEGIN(BEOutputMerger, pDC->drawId);
#if USE_8x2_TILE_BACKEND
- OutputMerger8x2(psContext, pColorBuffer, 0, &state.blendState,
state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets, state.colorHottileEnable, useAlternateOffset);
+ OutputMerger8x2(psContext, psContext.pColorBuffer, 0,
&state.blendState, state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets, state.colorHottileEnable, useAlternateOffset);
#else
- OutputMerger4x2(psContext, pColorBuffer, 0, &state.blendState,
state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets);
+ OutputMerger4x2(psContext, psContext.pColorBuffer, 0,
&state.blendState, state.pfnBlendFunc, vCoverageMask, depthPassMask,
state.psState.numRenderTargets);
#endif
// do final depth write after all pixel kills
@@ -212,13 +211,13 @@ Endtile:
{
for (uint32_t rt = 0; rt < state.psState.numRenderTargets;
++rt)
{
- pColorBuffer[rt] += (2 * KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
+ psContext.pColorBuffer[rt] += (2 * KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
}
}
#else
for (uint32_t rt = 0; rt < state.psState.numRenderTargets; ++rt)
{
- pColorBuffer[rt] += (KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
+ psContext.pColorBuffer[rt] += (KNOB_SIMD_WIDTH *
FormatTraits<KNOB_COLOR_HOT_TILE_FORMAT>::bpp) / 8;
}
#endif
pDepthBuffer += (KNOB_SIMD_WIDTH *
FormatTraits<KNOB_DEPTH_HOT_TILE_FORMAT>::bpp) / 8;
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
