Revert "panfrost: Don't DIY point size/coord fields"

This reverts commit 4508f43eed, which
broke a bunch of dEQP tests (e.g. in
dEQP-GLES2.functional.draw.draw_arrays.*)

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-07-25 13:16:45 -07:00
parent 295e5a17da
commit 2f9236096a
2 changed files with 9 additions and 2 deletions

View file

@ -103,8 +103,8 @@ panfrost_shader_compile(struct panfrost_context *ctx, struct mali_shader_meta *m
}
state->can_discard = s->info.fs.uses_discard;
state->writes_point_size = s->info.outputs_written & VARYING_SLOT_PSIZ;
state->reads_point_coord = s->info.inputs_read & VARYING_SLOT_PNTC;
state->writes_point_size = program.writes_point_size;
state->reads_point_coord = false;
state->helper_invocations = s->info.fs.needs_helper_invocations;
/* Separate as primary uniform count is truncated */
@ -136,10 +136,14 @@ panfrost_shader_compile(struct panfrost_context *ctx, struct mali_shader_meta *m
v.index = 2;
v.format = MALI_R16F;
v.swizzle = default_vec1_swizzle;
state->writes_point_size = true;
} else if (location == VARYING_SLOT_PNTC) {
v.index = 3;
v.format = MALI_RG16F;
v.swizzle = default_vec2_swizzle;
state->reads_point_coord = true;
} else {
v.index = 0;
}

View file

@ -87,6 +87,9 @@ typedef struct {
unsigned varyings[32];
/* Boolean properties of the program */
bool writes_point_size;
int first_tag;
struct util_dynarray compiled;