diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2013-09-15 17:58:12 +1200 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2013-10-03 07:56:29 +1300 |
| commit | c08f2083ee0c5d71351fe8eb9f41218a6fed7b10 (patch) | |
| tree | be8faaca968e024f31004b705c88c485237cef1f /src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | |
| parent | 5901d48b4161ff64d5708e4e13122fce5ed4d0bf (diff) | |
| download | external_mesa3d-c08f2083ee0c5d71351fe8eb9f41218a6fed7b10.zip external_mesa3d-c08f2083ee0c5d71351fe8eb9f41218a6fed7b10.tar.gz external_mesa3d-c08f2083ee0c5d71351fe8eb9f41218a6fed7b10.tar.bz2 | |
i965: Emit a second set of SURFACE_STATE for gather4 from textures.
This allows us to use a different surface format for gather4, which is
required for R32G32_FLOAT to work on Gen7.
V4: - Only emit alternate surface state for shaders which will actually
use it.
- Pass a simple 'for_gather' flag rather than a function pointer.
The callee can decide what w/a to apply.
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_wm_surface_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 89c0055..7f934f8 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c @@ -299,7 +299,8 @@ gen7_update_buffer_texture_surface(struct gl_context *ctx, static void gen7_update_texture_surface(struct gl_context *ctx, unsigned unit, - uint32_t *surf_offset) + uint32_t *surf_offset, + bool for_gather) { struct brw_context *brw = brw_context(ctx); struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current; @@ -322,6 +323,9 @@ gen7_update_texture_surface(struct gl_context *ctx, tObj->DepthMode, sampler->sRGBDecode); + if (for_gather && tex_format == BRW_SURFACEFORMAT_R32G32_FLOAT) + tex_format = BRW_SURFACEFORMAT_R32G32_FLOAT_LD; + surf[0] = translate_tex_target(tObj->Target) << BRW_SURFACE_TYPE_SHIFT | tex_format << BRW_SURFACE_FORMAT_SHIFT | gen7_surface_tiling_mode(mt->region->tiling) | |