X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fpanfrost%2Finclude%2Fpanfrost-job.h;h=c4481de51015ed4e9af83f4b0a86ccdb8921133d;hb=99d17fb771b77af5c693ce86aae6a61a05c05843;hp=a282c6e32e17753779a9d856bbc6d6ac310fd90d;hpb=64f3c9da87b701cd863315849f1beccee8f5fb3f;p=mesa.git diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h index a282c6e32e1..c4481de5101 100644 --- a/src/panfrost/include/panfrost-job.h +++ b/src/panfrost/include/panfrost-job.h @@ -38,35 +38,6 @@ typedef uint32_t u32; typedef uint64_t u64; typedef uint64_t mali_ptr; -enum mali_job_type { - JOB_NOT_STARTED = 0, - JOB_TYPE_NULL = 1, - JOB_TYPE_WRITE_VALUE = 2, - JOB_TYPE_CACHE_FLUSH = 3, - JOB_TYPE_COMPUTE = 4, - JOB_TYPE_VERTEX = 5, - JOB_TYPE_GEOMETRY = 6, - JOB_TYPE_TILER = 7, - JOB_TYPE_FUSED = 8, - JOB_TYPE_FRAGMENT = 9, -}; - -enum mali_draw_mode { - MALI_DRAW_NONE = 0x0, - MALI_POINTS = 0x1, - MALI_LINES = 0x2, - MALI_LINE_STRIP = 0x4, - MALI_LINE_LOOP = 0x6, - MALI_TRIANGLES = 0x8, - MALI_TRIANGLE_STRIP = 0xA, - MALI_TRIANGLE_FAN = 0xC, - MALI_POLYGON = 0xD, - MALI_QUADS = 0xE, - MALI_QUAD_STRIP = 0xF, - - /* All other modes invalid */ -}; - /* Applies to tiler_gl_enables */ #define MALI_OCCLUSION_QUERY (1 << 3) @@ -82,19 +53,6 @@ enum mali_draw_mode { #define MALI_CULL_FACE_FRONT (1 << 6) #define MALI_CULL_FACE_BACK (1 << 7) -/* Used in stencil and depth tests */ - -enum mali_func { - MALI_FUNC_NEVER = 0, - MALI_FUNC_LESS = 1, - MALI_FUNC_EQUAL = 2, - MALI_FUNC_LEQUAL = 3, - MALI_FUNC_GREATER = 4, - MALI_FUNC_NOTEQUAL = 5, - MALI_FUNC_GEQUAL = 6, - MALI_FUNC_ALWAYS = 7 -}; - /* Flags apply to unknown2_3? */ #define MALI_HAS_MSAA (1 << 0) @@ -127,30 +85,6 @@ enum mali_func { #define MALI_DEPTH_RANGE_B (1 << 13) #define MALI_NO_MSAA (1 << 14) -/* Stencil test state is all encoded in a single u32, just with a lot of - * enums... */ - -enum mali_stencil_op { - MALI_STENCIL_KEEP = 0, - MALI_STENCIL_REPLACE = 1, - MALI_STENCIL_ZERO = 2, - MALI_STENCIL_INVERT = 3, - MALI_STENCIL_INCR_WRAP = 4, - MALI_STENCIL_DECR_WRAP = 5, - MALI_STENCIL_INCR = 6, - MALI_STENCIL_DECR = 7 -}; - -struct mali_stencil_test { - unsigned ref : 8; - unsigned mask : 8; - enum mali_func func : 3; - enum mali_stencil_op sfail : 3; - enum mali_stencil_op dpfail : 3; - enum mali_stencil_op dppass : 3; - unsigned zero : 4; -} __attribute__((packed)); - #define MALI_MASK_R (1 << 0) #define MALI_MASK_G (1 << 1) #define MALI_MASK_B (1 << 2) @@ -225,13 +159,6 @@ enum mali_channel { MALI_CHANNEL_RESERVED_1 = 7, }; -struct mali_channel_swizzle { - enum mali_channel r : 3; - enum mali_channel g : 3; - enum mali_channel b : 3; - enum mali_channel a : 3; -} __attribute__((packed)); - /* Compressed per-pixel formats. Each of these formats expands to one to four * floating-point or integer numbers, as defined by the OpenGL specification. * There are various places in OpenGL where the user can specify a compressed @@ -643,8 +570,8 @@ struct mali_shader_meta { u8 stencil_mask_back; u16 unknown2_4; - struct mali_stencil_test stencil_front; - struct mali_stencil_test stencil_back; + struct mali_stencil_packed stencil_front; + struct mali_stencil_packed stencil_back; union { struct { @@ -960,24 +887,6 @@ struct mali_attr_meta { /* ORed into an MFBD address to specify the fbx section is included */ #define MALI_MFBD_TAG_EXTRA (0x2) -/* Uniform buffer objects are 64-bit fields divided as: - * - * u64 size : 10; - * mali_ptr ptr : 64 - 10; - * - * The size is actually the size minus 1 (MALI_POSITIVE), in units of 16 bytes. - * This gives a maximum of 2^14 bytes, which just so happens to be the GL - * minimum-maximum for GL_MAX_UNIFORM_BLOCK_SIZE. - * - * The pointer is missing the bottom 2 bits and top 8 bits. The top 8 bits - * should be 0 for userspace pointers, according to - * https://lwn.net/Articles/718895/. By reusing these bits, we can make each - * entry in the table only 64 bits. - */ - -#define MALI_MAKE_UBO(elements, ptr) \ - (MALI_POSITIVE((elements)) | (((ptr) >> 2) << 10)) - /* On Bifrost, these fields are the same between the vertex and tiler payloads. * They also seem to be the same between Bifrost and Midgard. They're shared in * fused payloads. @@ -1223,28 +1132,6 @@ struct bifrost_payload_fused { #define MALI_POSITIVE(dim) (dim - 1) -/* Used with wrapping. Unclear what top bit conveys */ - -enum mali_wrap_mode { - MALI_WRAP_REPEAT = 0x8 | 0x0, - MALI_WRAP_CLAMP_TO_EDGE = 0x8 | 0x1, - MALI_WRAP_CLAMP = 0x8 | 0x2, - MALI_WRAP_CLAMP_TO_BORDER = 0x8 | 0x3, - MALI_WRAP_MIRRORED_REPEAT = 0x8 | 0x4 | 0x0, - MALI_WRAP_MIRRORED_CLAMP_TO_EDGE = 0x8 | 0x4 | 0x1, - MALI_WRAP_MIRRORED_CLAMP = 0x8 | 0x4 | 0x2, - MALI_WRAP_MIRRORED_CLAMP_TO_BORDER = 0x8 | 0x4 | 0x3, -}; - -/* Shared across both command stream and Midgard, and even with Bifrost */ - -enum mali_texture_type { - MALI_TEX_CUBE = 0x0, - MALI_TEX_1D = 0x1, - MALI_TEX_2D = 0x2, - MALI_TEX_3D = 0x3 -}; - /* 8192x8192 */ #define MAX_MIP_LEVELS (13) @@ -1254,118 +1141,6 @@ enum mali_texture_type { /* For each pointer, there is an address and optionally also a stride */ #define MAX_ELEMENTS (2) -/* It's not known why there are 4-bits allocated -- this enum is almost - * certainly incomplete */ - -enum mali_texture_layout { - /* For a Z/S texture, this is linear */ - MALI_TEXTURE_TILED = 0x1, - - /* Z/S textures cannot be tiled */ - MALI_TEXTURE_LINEAR = 0x2, - - /* 16x16 sparse */ - MALI_TEXTURE_AFBC = 0xC -}; - -/* Corresponds to the type passed to glTexImage2D and so forth */ - -struct mali_texture_format { - unsigned swizzle : 12; - enum mali_format format : 8; - - unsigned srgb : 1; - unsigned unknown1 : 1; - - enum mali_texture_type type : 2; - enum mali_texture_layout layout : 4; - - /* Always set */ - unsigned unknown2 : 1; - - /* Set to allow packing an explicit stride */ - unsigned manual_stride : 1; - - unsigned zero : 2; -} __attribute__((packed)); - -struct mali_texture_descriptor { - uint16_t width; - uint16_t height; - uint16_t depth; - uint16_t array_size; - - struct mali_texture_format format; - - uint16_t unknown3; - - /* One for non-mipmapped, zero for mipmapped */ - uint8_t unknown3A; - - /* Zero for non-mipmapped, (number of levels - 1) for mipmapped */ - uint8_t levels; - - /* Swizzling is a single 32-bit word, broken up here for convenience. - * Here, swizzling refers to the ES 3.0 texture parameters for channel - * level swizzling, not the internal pixel-level swizzling which is - * below OpenGL's reach */ - - unsigned swizzle : 12; - unsigned swizzle_zero : 20; - - uint32_t unknown5; - uint32_t unknown6; - uint32_t unknown7; -} __attribute__((packed)); - -/* While Midgard texture descriptors are variable length, Bifrost descriptors - * are fixed like samplers with more pointers to expand if necessary */ - -struct bifrost_texture_descriptor { - unsigned format_unk : 4; /* 2 */ - enum mali_texture_type type : 2; - unsigned zero : 4; - unsigned format_swizzle : 12; - enum mali_format format : 8; - unsigned srgb : 1; - unsigned format_unk3 : 1; /* 0 */ - - uint16_t width; /* MALI_POSITIVE */ - uint16_t height; /* MALI_POSITIVE */ - - /* OpenGL swizzle */ - unsigned swizzle : 12; - enum mali_texture_layout layout : 4; - uint8_t levels : 8; /* Number of levels-1 if mipmapped, 0 if not */ - unsigned unk1 : 8; - - unsigned levels_unk : 24; /* 0 */ - unsigned level_2 : 8; /* Number of levels, again? */ - - mali_ptr payload; - - uint16_t array_size; - uint16_t unk4; - - uint16_t depth; - uint16_t unk5; -} __attribute__((packed)); - -/* filter_mode */ - -#define MALI_SAMP_MAG_NEAREST (1 << 0) -#define MALI_SAMP_MIN_NEAREST (1 << 1) - -/* TODO: What do these bits mean individually? Only seen set together */ - -#define MALI_SAMP_MIP_LINEAR_1 (1 << 3) -#define MALI_SAMP_MIP_LINEAR_2 (1 << 4) - -/* Flag in filter_mode, corresponding to OpenCL's NORMALIZED_COORDS_TRUE - * sampler_t flag. For typical OpenGL textures, this is always set. */ - -#define MALI_SAMP_NORM_COORDS (1 << 5) - /* Used for lod encoding. Thanks @urjaman for pointing out these routines can * be cleaned up a lot. */ @@ -1383,83 +1158,6 @@ FIXED_16(float x, bool allow_negative) return (int) (x * 256.0); } -struct mali_sampler_descriptor { - uint16_t filter_mode; - - /* Fixed point, signed. - * Upper 7 bits before the decimal point, although it caps [0-31]. - * Lower 8 bits after the decimal point: int(round(x * 256)) */ - - int16_t lod_bias; - int16_t min_lod; - int16_t max_lod; - - /* All one word in reality, but packed a bit. Comparisons are flipped - * from OpenGL. */ - - enum mali_wrap_mode wrap_s : 4; - enum mali_wrap_mode wrap_t : 4; - enum mali_wrap_mode wrap_r : 4; - enum mali_func compare_func : 3; - - /* No effect on 2D textures. For cubemaps, set for ES3 and clear for - * ES2, controlling seamless cubemapping */ - unsigned seamless_cube_map : 1; - - unsigned zero : 16; - - uint32_t zero2; - float border_color[4]; -} __attribute__((packed)); - -/* Bifrost sampler descriptors look pretty similar */ - -#define BIFROST_SAMP_MIN_NEAREST (1) -#define BIFROST_SAMP_MAG_LINEAR (1) - -struct bifrost_sampler_descriptor { - uint8_t unk1; - - enum mali_wrap_mode wrap_r : 4; - enum mali_wrap_mode wrap_t : 4; - enum mali_wrap_mode wrap_s : 4; - uint8_t unk8 : 4; - - uint8_t unk2 : 1; - uint8_t norm_coords : 1; - uint8_t unk3 : 1; - uint8_t min_filter : 1; - uint8_t zero1 : 1; - uint8_t mag_filter : 1; - uint8_t mip_filter : 1; - - int16_t min_lod; - int16_t max_lod; - - uint64_t zero2; - uint64_t zero3; - uint64_t zero4; -} __attribute__((packed)); - -/* viewport0/viewport1 form the arguments to glViewport. viewport1 is - * modified by MALI_POSITIVE; viewport0 is as-is. - */ - -struct mali_viewport { - /* XY clipping planes */ - float clip_minx; - float clip_miny; - float clip_maxx; - float clip_maxy; - - /* Depth clipping planes */ - float clip_minz; - float clip_maxz; - - u16 viewport0[2]; - u16 viewport1[2]; -} __attribute__((packed)); - /* From presentations, 16x16 tiles externally. Use shift for fast computation * of tile numbers. */ @@ -1569,13 +1267,6 @@ struct midgard_tiler_descriptor { u32 weights[8]; }; -enum mali_block_format { - MALI_BLOCK_TILED = 0x0, - MALI_BLOCK_UNKNOWN = 0x1, - MALI_BLOCK_LINEAR = 0x2, - MALI_BLOCK_AFBC = 0x3, -}; - struct mali_sfbd_format { /* 0x1 */ unsigned unk1 : 6; @@ -1700,20 +1391,6 @@ struct mali_single_framebuffer { } __attribute__((packed)); -/* SINGLE to disable multisampling, AVERAGE for - * EXT_multisampled_render_to_texture operation where multiple tilebuffer - * samples are implicitly resolved before writeout, MULTIPLE to write multiple - * samples inline, and LAYERED for ES3-style multisampling with each sample in - * a different buffer. - */ - -enum mali_msaa_mode { - MALI_MSAA_SINGLE = 0, - MALI_MSAA_AVERAGE = 1, - MALI_MSAA_MULTIPLE = 2, - MALI_MSAA_LAYERED = 3, -}; - #define MALI_MFBD_FORMAT_SRGB (1 << 0) struct mali_rt_format { @@ -1725,7 +1402,7 @@ struct mali_rt_format { unsigned unk3 : 4; unsigned unk4 : 1; enum mali_block_format block : 2; - enum mali_msaa_mode msaa : 2; + enum mali_msaa msaa : 2; unsigned flags : 2; unsigned swizzle : 12;