Mesa (master): intel/isl: Move get_format_encoding function to isl
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Feb 13 19:08:30 UTC 2020
Module: Mesa
Branch: master
Commit: 207a93bbff1ef0c40d8f7da339f03dbb12961a7c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=207a93bbff1ef0c40d8f7da339f03dbb12961a7c
Author: Sagar Ghuge <sagar.ghuge at intel.com>
Date: Mon Feb 3 21:57:38 2020 -0800
intel/isl: Move get_format_encoding function to isl
Move get_format_encoding function to isl and rename to
isl_get_aux_map_format_encoding.
v2:
- Rename isl_get_aux_map_format_encoding to
isl_format_get_aux_map_encoding (Jason Ekstrand)
Signed-off-by: Sagar Ghuge <sagar.ghuge at intel.com>
Suggested-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3719>
---
src/intel/common/gen_aux_map.c | 75 ++----------------------------------------
src/intel/isl/isl.c | 72 ++++++++++++++++++++++++++++++++++++++++
src/intel/isl/isl.h | 1 +
3 files changed, 75 insertions(+), 73 deletions(-)
diff --git a/src/intel/common/gen_aux_map.c b/src/intel/common/gen_aux_map.c
index 016161153e8..c3e7d8257a5 100644
--- a/src/intel/common/gen_aux_map.c
+++ b/src/intel/common/gen_aux_map.c
@@ -78,6 +78,7 @@
#include "gen_gem.h"
#include "dev/gen_device_info.h"
+#include "isl/isl.h"
#include "drm-uapi/i915_drm.h"
#include "util/list.h"
@@ -280,78 +281,6 @@ get_u64_entry_ptr(struct gen_aux_map_context *ctx, uint64_t addr)
return (uint64_t*)((uint8_t*)buf->buffer->map + map_offset);
}
-static uint8_t
-get_format_encoding(const struct isl_surf *isl_surf)
-{
- switch(isl_surf->format) {
- case ISL_FORMAT_R32G32B32A32_FLOAT: return 0x11;
- case ISL_FORMAT_R32G32B32X32_FLOAT: return 0x11;
- case ISL_FORMAT_R32G32B32A32_SINT: return 0x12;
- case ISL_FORMAT_R32G32B32A32_UINT: return 0x13;
- case ISL_FORMAT_R16G16B16A16_UNORM: return 0x14;
- case ISL_FORMAT_R16G16B16A16_SNORM: return 0x15;
- case ISL_FORMAT_R16G16B16A16_SINT: return 0x16;
- case ISL_FORMAT_R16G16B16A16_UINT: return 0x17;
- case ISL_FORMAT_R16G16B16A16_FLOAT: return 0x10;
- case ISL_FORMAT_R16G16B16X16_FLOAT: return 0x10;
- case ISL_FORMAT_R32G32_FLOAT: return 0x11;
- case ISL_FORMAT_R32G32_SINT: return 0x12;
- case ISL_FORMAT_R32G32_UINT: return 0x13;
- case ISL_FORMAT_B8G8R8A8_UNORM: return 0xA;
- case ISL_FORMAT_B8G8R8X8_UNORM: return 0xA;
- case ISL_FORMAT_B8G8R8A8_UNORM_SRGB: return 0xA;
- case ISL_FORMAT_B8G8R8X8_UNORM_SRGB: return 0xA;
- case ISL_FORMAT_R10G10B10A2_UNORM: return 0x18;
- case ISL_FORMAT_R10G10B10A2_UNORM_SRGB: return 0x18;
- case ISL_FORMAT_R10G10B10_FLOAT_A2_UNORM: return 0x19;
- case ISL_FORMAT_R10G10B10A2_UINT: return 0x1A;
- case ISL_FORMAT_R8G8B8A8_UNORM: return 0xA;
- case ISL_FORMAT_R8G8B8A8_UNORM_SRGB: return 0xA;
- case ISL_FORMAT_R8G8B8A8_SNORM: return 0x1B;
- case ISL_FORMAT_R8G8B8A8_SINT: return 0x1C;
- case ISL_FORMAT_R8G8B8A8_UINT: return 0x1D;
- case ISL_FORMAT_R16G16_UNORM: return 0x14;
- case ISL_FORMAT_R16G16_SNORM: return 0x15;
- case ISL_FORMAT_R16G16_SINT: return 0x16;
- case ISL_FORMAT_R16G16_UINT: return 0x17;
- case ISL_FORMAT_R16G16_FLOAT: return 0x10;
- case ISL_FORMAT_B10G10R10A2_UNORM: return 0x18;
- case ISL_FORMAT_B10G10R10A2_UNORM_SRGB: return 0x18;
- case ISL_FORMAT_R11G11B10_FLOAT: return 0x1E;
- case ISL_FORMAT_R32_SINT: return 0x12;
- case ISL_FORMAT_R32_UINT: return 0x13;
- case ISL_FORMAT_R32_FLOAT: return 0x11;
- case ISL_FORMAT_R24_UNORM_X8_TYPELESS: return 0x11;
- case ISL_FORMAT_B5G6R5_UNORM: return 0xA;
- case ISL_FORMAT_B5G6R5_UNORM_SRGB: return 0xA;
- case ISL_FORMAT_B5G5R5A1_UNORM: return 0xA;
- case ISL_FORMAT_B5G5R5A1_UNORM_SRGB: return 0xA;
- case ISL_FORMAT_B4G4R4A4_UNORM: return 0xA;
- case ISL_FORMAT_B4G4R4A4_UNORM_SRGB: return 0xA;
- case ISL_FORMAT_R8G8_UNORM: return 0xA;
- case ISL_FORMAT_R8G8_SNORM: return 0x1B;
- case ISL_FORMAT_R8G8_SINT: return 0x1C;
- case ISL_FORMAT_R8G8_UINT: return 0x1D;
- case ISL_FORMAT_R16_UNORM: return 0x14;
- case ISL_FORMAT_R16_SNORM: return 0x15;
- case ISL_FORMAT_R16_SINT: return 0x16;
- case ISL_FORMAT_R16_UINT: return 0x17;
- case ISL_FORMAT_R16_FLOAT: return 0x10;
- case ISL_FORMAT_B5G5R5X1_UNORM: return 0xA;
- case ISL_FORMAT_B5G5R5X1_UNORM_SRGB: return 0xA;
- case ISL_FORMAT_A1B5G5R5_UNORM: return 0xA;
- case ISL_FORMAT_A4B4G4R4_UNORM: return 0xA;
- case ISL_FORMAT_R8_UNORM: return 0xA;
- case ISL_FORMAT_R8_SNORM: return 0x1B;
- case ISL_FORMAT_R8_SINT: return 0x1C;
- case ISL_FORMAT_R8_UINT: return 0x1D;
- case ISL_FORMAT_A8_UNORM: return 0xA;
- default:
- unreachable("Unsupported aux-map format!");
- return 0;
- }
-}
-
static uint8_t
get_bpp_encoding(uint16_t bpp)
{
@@ -386,7 +315,7 @@ gen_aux_map_format_bits_for_isl_surf(const struct isl_surf *isl_surf)
assert(isl_tiling_is_any_y(isl_surf->tiling));
uint64_t format_bits =
- ((uint64_t)get_format_encoding(isl_surf) << 58) |
+ ((uint64_t)isl_format_get_aux_map_encoding(isl_surf->format) << 58) |
((uint64_t)get_bpp_encoding(bpp) << 54) |
GEN_AUX_MAP_ENTRY_Y_TILED_BIT;
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index f737f8b3b53..27b9073b180 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -2840,3 +2840,75 @@ isl_swizzle_invert(struct isl_swizzle swizzle)
return (struct isl_swizzle) { chans[0], chans[1], chans[2], chans[3] };
}
+
+uint8_t
+isl_format_get_aux_map_encoding(enum isl_format format)
+{
+ switch(format) {
+ case ISL_FORMAT_R32G32B32A32_FLOAT: return 0x11;
+ case ISL_FORMAT_R32G32B32X32_FLOAT: return 0x11;
+ case ISL_FORMAT_R32G32B32A32_SINT: return 0x12;
+ case ISL_FORMAT_R32G32B32A32_UINT: return 0x13;
+ case ISL_FORMAT_R16G16B16A16_UNORM: return 0x14;
+ case ISL_FORMAT_R16G16B16A16_SNORM: return 0x15;
+ case ISL_FORMAT_R16G16B16A16_SINT: return 0x16;
+ case ISL_FORMAT_R16G16B16A16_UINT: return 0x17;
+ case ISL_FORMAT_R16G16B16A16_FLOAT: return 0x10;
+ case ISL_FORMAT_R16G16B16X16_FLOAT: return 0x10;
+ case ISL_FORMAT_R32G32_FLOAT: return 0x11;
+ case ISL_FORMAT_R32G32_SINT: return 0x12;
+ case ISL_FORMAT_R32G32_UINT: return 0x13;
+ case ISL_FORMAT_B8G8R8A8_UNORM: return 0xA;
+ case ISL_FORMAT_B8G8R8X8_UNORM: return 0xA;
+ case ISL_FORMAT_B8G8R8A8_UNORM_SRGB: return 0xA;
+ case ISL_FORMAT_B8G8R8X8_UNORM_SRGB: return 0xA;
+ case ISL_FORMAT_R10G10B10A2_UNORM: return 0x18;
+ case ISL_FORMAT_R10G10B10A2_UNORM_SRGB: return 0x18;
+ case ISL_FORMAT_R10G10B10_FLOAT_A2_UNORM: return 0x19;
+ case ISL_FORMAT_R10G10B10A2_UINT: return 0x1A;
+ case ISL_FORMAT_R8G8B8A8_UNORM: return 0xA;
+ case ISL_FORMAT_R8G8B8A8_UNORM_SRGB: return 0xA;
+ case ISL_FORMAT_R8G8B8A8_SNORM: return 0x1B;
+ case ISL_FORMAT_R8G8B8A8_SINT: return 0x1C;
+ case ISL_FORMAT_R8G8B8A8_UINT: return 0x1D;
+ case ISL_FORMAT_R16G16_UNORM: return 0x14;
+ case ISL_FORMAT_R16G16_SNORM: return 0x15;
+ case ISL_FORMAT_R16G16_SINT: return 0x16;
+ case ISL_FORMAT_R16G16_UINT: return 0x17;
+ case ISL_FORMAT_R16G16_FLOAT: return 0x10;
+ case ISL_FORMAT_B10G10R10A2_UNORM: return 0x18;
+ case ISL_FORMAT_B10G10R10A2_UNORM_SRGB: return 0x18;
+ case ISL_FORMAT_R11G11B10_FLOAT: return 0x1E;
+ case ISL_FORMAT_R32_SINT: return 0x12;
+ case ISL_FORMAT_R32_UINT: return 0x13;
+ case ISL_FORMAT_R32_FLOAT: return 0x11;
+ case ISL_FORMAT_R24_UNORM_X8_TYPELESS: return 0x11;
+ case ISL_FORMAT_B5G6R5_UNORM: return 0xA;
+ case ISL_FORMAT_B5G6R5_UNORM_SRGB: return 0xA;
+ case ISL_FORMAT_B5G5R5A1_UNORM: return 0xA;
+ case ISL_FORMAT_B5G5R5A1_UNORM_SRGB: return 0xA;
+ case ISL_FORMAT_B4G4R4A4_UNORM: return 0xA;
+ case ISL_FORMAT_B4G4R4A4_UNORM_SRGB: return 0xA;
+ case ISL_FORMAT_R8G8_UNORM: return 0xA;
+ case ISL_FORMAT_R8G8_SNORM: return 0x1B;
+ case ISL_FORMAT_R8G8_SINT: return 0x1C;
+ case ISL_FORMAT_R8G8_UINT: return 0x1D;
+ case ISL_FORMAT_R16_UNORM: return 0x14;
+ case ISL_FORMAT_R16_SNORM: return 0x15;
+ case ISL_FORMAT_R16_SINT: return 0x16;
+ case ISL_FORMAT_R16_UINT: return 0x17;
+ case ISL_FORMAT_R16_FLOAT: return 0x10;
+ case ISL_FORMAT_B5G5R5X1_UNORM: return 0xA;
+ case ISL_FORMAT_B5G5R5X1_UNORM_SRGB: return 0xA;
+ case ISL_FORMAT_A1B5G5R5_UNORM: return 0xA;
+ case ISL_FORMAT_A4B4G4R4_UNORM: return 0xA;
+ case ISL_FORMAT_R8_UNORM: return 0xA;
+ case ISL_FORMAT_R8_SNORM: return 0x1B;
+ case ISL_FORMAT_R8_SINT: return 0x1C;
+ case ISL_FORMAT_R8_UINT: return 0x1D;
+ case ISL_FORMAT_A8_UNORM: return 0xA;
+ default:
+ unreachable("Unsupported aux-map format!");
+ return 0;
+ }
+}
diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index b3031b495a0..9b96f7a5281 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -1510,6 +1510,7 @@ bool isl_format_supports_multisampling(const struct gen_device_info *devinfo,
bool isl_formats_are_ccs_e_compatible(const struct gen_device_info *devinfo,
enum isl_format format1,
enum isl_format format2);
+uint8_t isl_format_get_aux_map_encoding(enum isl_format format);
bool isl_format_has_unorm_channel(enum isl_format fmt) ATTRIBUTE_CONST;
bool isl_format_has_snorm_channel(enum isl_format fmt) ATTRIBUTE_CONST;
More information about the mesa-commit
mailing list