v3d: Fix polygon offset for Z16 buffers.

Fixes:
dEQP-GLES3.functional.polygon_offset.fixed16_displacement_with_units
dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units
This commit is contained in:
Eric Anholt
2018-06-13 13:44:01 -07:00
parent d91e06a065
commit cd2e673abc
3 changed files with 14 additions and 2 deletions

View File

@@ -431,6 +431,11 @@ struct v3d_rasterizer_state {
* VC5_PACKET_DEPTH_OFFSET
*/
uint16_t offset_units;
/**
* The HW treats polygon offset units based on a Z24 buffer, so we
* need to scale up offset_units if we're only Z16.
*/
uint16_t z16_offset_units;
/**
* Half-float (1/8/7 bits) value of polygon offset scale for
* VC5_PACKET_DEPTH_OFFSET

View File

@@ -431,8 +431,14 @@ v3dX(emit_state)(struct pipe_context *pctx)
cl_emit(&job->bcl, DEPTH_OFFSET, depth) {
depth.depth_offset_factor =
v3d->rasterizer->offset_factor;
depth.depth_offset_units =
v3d->rasterizer->offset_units;
if (job->zsbuf &&
job->zsbuf->format == PIPE_FORMAT_Z16_UNORM) {
depth.depth_offset_units =
v3d->rasterizer->z16_offset_units;
} else {
depth.depth_offset_units =
v3d->rasterizer->offset_units;
}
}
}

View File

@@ -116,6 +116,7 @@ v3d_create_rasterizer_state(struct pipe_context *pctx,
if (cso->offset_tri) {
so->offset_units = float_to_187_half(cso->offset_units);
so->z16_offset_units = float_to_187_half(cso->offset_units * 256.0);
so->offset_factor = float_to_187_half(cso->offset_scale);
}