diff options
| author | Kenneth Graunke <[email protected]> | 2017-03-01 23:31:15 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-03-02 00:30:45 -0800 |
| commit | 58793e514b6c57924b08d3a9c766ed05e8d9662a (patch) | |
| tree | 3d2c848c4367cd74e48cef23734c24eb6d613693 /src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | |
| parent | 92281b2c7f61d6fb8f7cc43eac15bb487f1e9848 (diff) | |
i965: Replace BRW_SURFACEFORMAT_* with ISL_FORMAT_*.
One less set of enums. Dropped the #defines from brw_defines.h and ran:
$ for file in *.cpp *.c *.h; do sed -i \
-e 's/BRW_SURFACEFORMAT_/ISL_FORMAT_/g' \
-e 's/ISL_FORMAT_ASTC_[A-Zxs0-9_]*/\U&/g' $file; \
done
Signed-off-by: Kenneth Graunke <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
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 | 10 |
1 files changed, 5 insertions, 5 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 5587a028001..e30dbb336d9 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c @@ -115,10 +115,10 @@ gen7_check_surface_setup(uint32_t *surf, bool is_render_target) } if (is_multisampled) { switch (GET_FIELD(surf[0], BRW_SURFACE_FORMAT)) { - case BRW_SURFACEFORMAT_I24X8_UNORM: - case BRW_SURFACEFORMAT_L24X8_UNORM: - case BRW_SURFACEFORMAT_A24X8_UNORM: - case BRW_SURFACEFORMAT_R24_UNORM_X8_TYPELESS: + case ISL_FORMAT_I24X8_UNORM: + case ISL_FORMAT_L24X8_UNORM: + case ISL_FORMAT_A24X8_UNORM: + case ISL_FORMAT_R24_UNORM_X8_TYPELESS: assert(multisampled_surface_storage_format == GEN7_SURFACE_MSFMT_DEPTH_STENCIL); } @@ -164,7 +164,7 @@ gen7_emit_null_surface_state(struct brw_context *brw, * "If Surface Type is SURFTYPE_NULL, this field must be TRUE." */ surf[0] = BRW_SURFACE_NULL << BRW_SURFACE_TYPE_SHIFT | - BRW_SURFACEFORMAT_B8G8R8A8_UNORM << BRW_SURFACE_FORMAT_SHIFT | + ISL_FORMAT_B8G8R8A8_UNORM << BRW_SURFACE_FORMAT_SHIFT | GEN7_SURFACE_TILING_Y; surf[2] = SET_FIELD(width - 1, GEN7_SURFACE_WIDTH) | |