diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-11-08 02:21:42 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-11-27 20:25:23 -0800 |
| commit | 06372c3fa9940b6ebbc03ebb2cdfdedc87076cc0 (patch) | |
| tree | f23e39e57a81d8bcc9f85ca2f552615274d0ca92 /src/mesa/drivers/dri/i965/gen8_depth_state.c | |
| parent | a0f8b363c0976ab3b58b76df687e664b0c99d6c9 (diff) | |
| download | external_mesa3d-06372c3fa9940b6ebbc03ebb2cdfdedc87076cc0.zip external_mesa3d-06372c3fa9940b6ebbc03ebb2cdfdedc87076cc0.tar.gz external_mesa3d-06372c3fa9940b6ebbc03ebb2cdfdedc87076cc0.tar.bz2 | |
i965: Use brw_wm_prog_data::uses_kill, not gl_fragment_program::UsesKill
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen8_depth_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_depth_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c b/src/mesa/drivers/dri/i965/gen8_depth_state.c index e716141..8efc7c5 100644 --- a/src/mesa/drivers/dri/i965/gen8_depth_state.c +++ b/src/mesa/drivers/dri/i965/gen8_depth_state.c @@ -286,7 +286,7 @@ pma_fix_enable(const struct brw_context *brw) (fp->Base.OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) && fp->FragDepthLayout != FRAG_DEPTH_LAYOUT_UNCHANGED; - /* BRW_NEW_FRAGMENT_PROGRAM: 3DSTATE_PS_EXTRA::PixelShaderKillsPixels + /* CACHE_NEW_WM_PROG: 3DSTATE_PS_EXTRA::PixelShaderKillsPixels * CACHE_NEW_WM_PROG: 3DSTATE_PS_EXTRA::oMask Present to RenderTarget * _NEW_MULTISAMPLE: 3DSTATE_PS_BLEND::AlphaToCoverageEnable * _NEW_COLOR: 3DSTATE_PS_BLEND::AlphaTestEnable @@ -295,7 +295,7 @@ pma_fix_enable(const struct brw_context *brw) * 3DSTATE_WM::ForceKillPix != ForceOff is always true. */ const bool kill_pixel = - fp->UsesKill || + brw->wm.prog_data->uses_kill || brw->wm.prog_data->uses_omask || (ctx->Multisample._Enabled && ctx->Multisample.SampleAlphaToCoverage) || ctx->Color.AlphaEnabled; |