OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: move viewport pre-computed xform outside of radv_viewport_state

Browse Source 
I think we should distinguish between dynamic states (applications) and
hardware states, and this will allow us to use vk_viewport_state
instead of our own structs.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20314>
This commit is contained in:
Samuel Pitoiset
2022-12-14 09:09:04 +01:00
committed by Marge Bot
parent aa1a752979
commit 0241094eb4
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -158,7 +158,7 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy
if (memcmp(&dest->viewport.viewports, &src->viewport.viewports, if (memcmp(&dest->viewport.viewports, &src->viewport.viewports,
src->viewport.count * sizeof(VkViewport))) { src->viewport.count * sizeof(VkViewport))) {
typed_memcpy(dest->viewport.viewports, src->viewport.viewports, src->viewport.count); typed_memcpy(dest->viewport.viewports, src->viewport.viewports, src->viewport.count);
typed_memcpy(dest->viewport.xform, src->viewport.xform, src->viewport.count); typed_memcpy(dest->hw_vp.xform, src->hw_vp.xform, src->viewport.count);
dest_mask |= RADV_DYNAMIC_VIEWPORT; dest_mask |= RADV_DYNAMIC_VIEWPORT;
} }
} }
@@ -2016,18 +2016,18 @@ radv_emit_viewport(struct radv_cmd_buffer *cmd_buffer)
radeon_set_context_reg_seq(cmd_buffer->cs, R_02843C_PA_CL_VPORT_XSCALE, d->viewport.count * 6); radeon_set_context_reg_seq(cmd_buffer->cs, R_02843C_PA_CL_VPORT_XSCALE, d->viewport.count * 6);
for (unsigned i = 0; i < d->viewport.count; i++) { for (unsigned i = 0; i < d->viewport.count; i++) {
radeon_emit(cmd_buffer->cs, fui(d->viewport.xform[i].scale[0])); radeon_emit(cmd_buffer->cs, fui(d->hw_vp.xform[i].scale[0]));
radeon_emit(cmd_buffer->cs, fui(d->viewport.xform[i].translate[0])); radeon_emit(cmd_buffer->cs, fui(d->hw_vp.xform[i].translate[0]));
radeon_emit(cmd_buffer->cs, fui(d->viewport.xform[i].scale[1])); radeon_emit(cmd_buffer->cs, fui(d->hw_vp.xform[i].scale[1]));
radeon_emit(cmd_buffer->cs, fui(d->viewport.xform[i].translate[1])); radeon_emit(cmd_buffer->cs, fui(d->hw_vp.xform[i].translate[1]));
double scale_z, translate_z; double scale_z, translate_z;
if (d->depth_clip_negative_one_to_one) { if (d->depth_clip_negative_one_to_one) {
scale_z = d->viewport.xform[i].scale[2] * 0.5f; scale_z = d->hw_vp.xform[i].scale[2] * 0.5f;
translate_z = (d->viewport.xform[i].translate[2] + d->viewport.viewports[i].maxDepth) * 0.5f; translate_z = (d->hw_vp.xform[i].translate[2] + d->viewport.viewports[i].maxDepth) * 0.5f;
} else { } else {
scale_z = d->viewport.xform[i].scale[2]; scale_z = d->hw_vp.xform[i].scale[2];
translate_z = d->viewport.xform[i].translate[2]; translate_z = d->hw_vp.xform[i].translate[2];
} }
radeon_emit(cmd_buffer->cs, fui(scale_z)); radeon_emit(cmd_buffer->cs, fui(scale_z));
@@ -6169,8 +6169,8 @@ radv_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint3
viewportCount * sizeof(*pViewports)); viewportCount * sizeof(*pViewports));
for (unsigned i = 0; i < viewportCount; i++) { for (unsigned i = 0; i < viewportCount; i++) {
radv_get_viewport_xform(&pViewports[i], radv_get_viewport_xform(&pViewports[i],
state->dynamic.viewport.xform[i + firstViewport].scale, state->dynamic.hw_vp.xform[i + firstViewport].scale,
state->dynamic.viewport.xform[i + firstViewport].translate); state->dynamic.hw_vp.xform[i + firstViewport].translate);
} }
state->dirty |= RADV_CMD_DIRTY_DYNAMIC_VIEWPORT | RADV_CMD_DIRTY_GUARDBAND; state->dirty |= RADV_CMD_DIRTY_DYNAMIC_VIEWPORT | RADV_CMD_DIRTY_GUARDBAND;
@@ -8301,8 +8301,8 @@ radv_emit_ngg_culling_state(struct radv_cmd_buffer *cmd_buffer, const struct rad
/* Get viewport transform. */ /* Get viewport transform. */
float vp_scale[2], vp_translate[2]; float vp_scale[2], vp_translate[2];
memcpy(vp_scale, cmd_buffer->state.dynamic.viewport.xform[0].scale, 2 * sizeof(float)); memcpy(vp_scale, cmd_buffer->state.dynamic.hw_vp.xform[0].scale, 2 * sizeof(float));
memcpy(vp_translate, cmd_buffer->state.dynamic.viewport.xform[0].translate, 2 * sizeof(float)); memcpy(vp_translate, cmd_buffer->state.dynamic.hw_vp.xform[0].translate, 2 * sizeof(float));
bool vp_y_inverted = (-vp_scale[1] + vp_translate[1]) > (vp_scale[1] + vp_translate[1]); bool vp_y_inverted = (-vp_scale[1] + vp_translate[1]) > (vp_scale[1] + vp_translate[1]);
/* Get current culling settings. */ /* Get current culling settings. */

2
src/amd/vulkan/radv_pipeline.c
View File

@@ -1527,7 +1527,7 @@ radv_pipeline_init_dynamic_state(struct radv_graphics_pipeline *pipeline,
typed_memcpy(dynamic->viewport.viewports, state->vp->viewports, state->vp->viewport_count); typed_memcpy(dynamic->viewport.viewports, state->vp->viewports, state->vp->viewport_count);
for (unsigned i = 0; i < dynamic->viewport.count; i++) for (unsigned i = 0; i < dynamic->viewport.count; i++)
radv_get_viewport_xform(&dynamic->viewport.viewports[i], radv_get_viewport_xform(&dynamic->viewport.viewports[i],
dynamic->viewport.xform[i].scale, dynamic->viewport.xform[i].translate); dynamic->hw_vp.xform[i].scale, dynamic->hw_vp.xform[i].translate);
} }
} }

11
src/amd/vulkan/radv_private.h
View File

@@ -1301,10 +1301,6 @@ struct radv_streamout_state {
struct radv_viewport_state { struct radv_viewport_state {
uint32_t count; uint32_t count;
VkViewport viewports[MAX_VIEWPORTS]; VkViewport viewports[MAX_VIEWPORTS];
struct {
float scale[3];
float translate[3];
} xform[MAX_VIEWPORTS];
}; };
struct radv_scissor_state { struct radv_scissor_state {
@@ -1331,6 +1327,13 @@ struct radv_dynamic_state {
*/ */
uint64_t mask; uint64_t mask;
struct {
struct {
float scale[3];
float translate[3];
} xform[MAX_VIEWPORTS];
} hw_vp;
struct radv_viewport_state viewport; struct radv_viewport_state viewport;
struct radv_scissor_state scissor; struct radv_scissor_state scissor;