KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panfrost: Remove mali_vertex_tiler_postfix 

Now XMLified everywhere.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6476>
This commit is contained in:
Alyssa Rosenzweig 2020-08-26 17:10:37 -04:00 committed by Marge Bot
parent 760289174b
commit eb261a8018
2 changed files with 18 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/panfrost/bifrost/test/bi_submit.c
View File

@ -186,27 +186,31 @@ bit_vertex(struct panfrost_device *dev, panfrost_program prog,
.opaque = { (5) << 26 }
}
},
.postfix = {
.gl_enables = 0x2,
.shared_memory = shmem->gpu,
.shader = shader_desc->gpu,
.uniforms = ubo->gpu + 1024,
.uniform_buffers = ubo->gpu,
.attribute_meta = attr->gpu,
.attributes = attr->gpu + 256,
.varying_meta = var->gpu,
.varyings = var->gpu + 256,
},
};
struct mali_draw_packed draw;
struct mali_invocation_packed invocation;
pan_pack(&draw, DRAW, cfg) {
cfg.unknown_1 = 0x2;
cfg.shared = shmem->gpu;
cfg.state = shader_desc->gpu;
cfg.push_uniforms = ubo->gpu + 1024;
cfg.uniform_buffers = ubo->gpu;
cfg.attributes = attr->gpu;
cfg.attribute_buffers = attr->gpu + 256;
cfg.varyings = var->gpu;
cfg.varying_buffers = var->gpu + 256;
}
panfrost_pack_work_groups_compute(&invocation,
1, 1, 1,
1, 1, 1,
true);
payload.prefix.invocation = invocation;
payload.postfix = draw;
struct panfrost_bo *bos[] = {
scratchpad, shmem, shader, shader_desc, ubo, var, attr

78
src/panfrost/include/panfrost-job.h
View File

@ -38,21 +38,6 @@ typedef uint32_t u32;
typedef uint64_t u64;
typedef uint64_t mali_ptr;
/* Applies to tiler_gl_enables */
#define MALI_OCCLUSION_QUERY (1 << 3)
#define MALI_OCCLUSION_PRECISE (1 << 4)
/* Set for a glFrontFace(GL_CCW) in a Y=0=TOP coordinate system (like Gallium).
* In OpenGL, this would corresponds to glFrontFace(GL_CW). Mesa and the blob
* disagree about how to do viewport flipping, so the blob actually sets this
* for GL_CW but then has a negative viewport stride */
#define MALI_FRONT_CCW_TOP (1 << 5)
#define MALI_CULL_FACE_FRONT (1 << 6)
#define MALI_CULL_FACE_BACK (1 << 7)
enum mali_nondominant_mode {
MALI_BLEND_NON_MIRROR = 0,
MALI_BLEND_NON_ZERO = 1
@ -464,72 +449,15 @@ struct bifrost_tiler_meta {
u64 zeros[20];
} __attribute__((packed));
struct mali_vertex_tiler_postfix {
u16 gl_enables; // 0x6 on Midgard, 0x2 on Bifrost
/* Both zero for non-instanced draws. For instanced draws, a
* decomposition of padded_num_vertices. See the comments about the
* corresponding fields in mali_attr for context. */
unsigned instance_shift : 5;
unsigned instance_odd : 3;
u8 zero4;
/* Offset for first vertex in buffer */
u32 offset_start;
u64 zero5;
/* Zero for vertex jobs. Pointer to the position (gl_Position) varying
* output from the vertex shader for tiler jobs.
*/
u64 position_varying;
/* An array of mali_uniform_buffer_meta's. The size is given by the
* shader_meta.
*/
u64 uniform_buffers;
/* On Bifrost, this is a pointer to an array of bifrost_texture_descriptor.
* On Midgard, this is a pointer to an array of pointers to the texture
* descriptors, number of pointers bounded by number of textures. The
* indirection is needed to accomodate varying numbers and sizes of
* texture descriptors */
u64 textures;
/* For OpenGL, from what I've seen, this is intimately connected to
* texture_meta. cwabbott says this is not the case under Vulkan, hence
* why this field is seperate (Midgard is Vulkan capable). Pointer to
* array of sampler descriptors (which are uniform in size) */
u64 sampler_descriptor;
u64 uniforms;
u64 shader;
u64 attributes; /* struct attribute_buffer[] */
u64 attribute_meta; /* attribute_meta[] */
u64 varyings; /* struct attr */
u64 varying_meta; /* pointer */
u64 viewport;
u64 occlusion_counter; /* A single bit as far as I can tell */
/* On Bifrost, this points directly to a mali_shared_memory structure.
* On Midgard, this points to a framebuffer (either SFBD or MFBD as
* tagged), which embeds a mali_shared_memory structure */
mali_ptr shared_memory;
} __attribute__((packed));
struct midgard_payload_vertex_tiler {
struct mali_vertex_tiler_prefix prefix;
struct mali_vertex_tiler_postfix postfix;
struct mali_draw_packed postfix;
union midgard_primitive_size primitive_size;
} __attribute__((packed));
struct bifrost_payload_vertex {
struct mali_vertex_tiler_prefix prefix;
struct mali_vertex_tiler_postfix postfix;
struct mali_draw_packed postfix;
} __attribute__((packed));
struct bifrost_payload_tiler {
@ -537,7 +465,7 @@ struct bifrost_payload_tiler {
union midgard_primitive_size primitive_size;
mali_ptr tiler_meta;
u64 zero1, zero2, zero3, zero4, zero5, zero6;
struct mali_vertex_tiler_postfix postfix;
struct mali_draw_packed postfix;
} __attribute__((packed));
/* Purposeful off-by-one in width, height fields. For example, a (64, 64)