diff options
| author | Chris Forbes <[email protected]> | 2013-09-30 22:53:14 +1300 |
|---|---|---|
| committer | Chris Forbes <[email protected]> | 2013-10-03 07:56:40 +1300 |
| commit | 88f196ab6e2c3efcc75642533aad8bed8c87267a (patch) | |
| tree | e213419200a9a01f03ac207d4e82656d4199ae02 | |
| parent | 7df985ad47df831f842843f2db9f7658b11d3df2 (diff) | |
i965/hsw: Apply gather4 RG32F w/a using SCS instead of shader.
The new surface channel select bits allow us to avoid having to
recompile the shader for this workaround.
Signed-off-by: Chris Forbes <[email protected]>
Reviewed-and-tested-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 3d1ed447cc8..6ce58dda35a 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -346,8 +346,9 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx, key->gl_clamp_mask[2] |= 1 << s; } - /* gather4's channel select for green from RG32F is broken */ - if (brw->gen >= 7 && prog->UsesGather) { + /* gather4's channel select for green from RG32F is broken; + * requires a shader w/a on IVB; fixable with just SCS on HSW. */ + if (brw->gen >= 7 && !brw->is_haswell && prog->UsesGather) { if (img->InternalFormat == GL_RG32F && GET_SWZ(t->_Swizzle, 0) == 1) key->gather_channel_quirk_mask |= 1 << s; } diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c index 7f934f89e83..564ac761658 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c @@ -42,13 +42,13 @@ * "Shader Channel Select" enumerations (i.e. HSW_SCS_RED) */ static unsigned -swizzle_to_scs(GLenum swizzle) +swizzle_to_scs(GLenum swizzle, bool need_green_to_blue) { switch (swizzle) { case SWIZZLE_X: return HSW_SCS_RED; case SWIZZLE_Y: - return HSW_SCS_GREEN; + return need_green_to_blue ? HSW_SCS_BLUE : HSW_SCS_GREEN; case SWIZZLE_Z: return HSW_SCS_BLUE; case SWIZZLE_W: @@ -369,11 +369,13 @@ gen7_update_texture_surface(struct gl_context *ctx, const int swizzle = unlikely(alpha_depth) ? SWIZZLE_XYZW : brw_get_texture_swizzle(ctx, tObj); + const bool need_scs_green_to_blue = for_gather && tex_format == BRW_SURFACEFORMAT_R32G32_FLOAT_LD; + surf[7] = - SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 0)), GEN7_SURFACE_SCS_R) | - SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 1)), GEN7_SURFACE_SCS_G) | - SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 2)), GEN7_SURFACE_SCS_B) | - SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 3)), GEN7_SURFACE_SCS_A); + SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 0), need_scs_green_to_blue), GEN7_SURFACE_SCS_R) | + SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 1), need_scs_green_to_blue), GEN7_SURFACE_SCS_G) | + SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 2), need_scs_green_to_blue), GEN7_SURFACE_SCS_B) | + SET_FIELD(swizzle_to_scs(GET_SWZ(swizzle, 3), need_scs_green_to_blue), GEN7_SURFACE_SCS_A); } /* Emit relocation to surface contents */ |