fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 12:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panvk: Clamp viewport scissor to valid range

Browse source 
Fix "dEQP-VK.draw.renderpass.offscreen_viewport.x_off_screen_negative_y*" tests.

Also did a bit of clean up around emit_viewport.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29802>
This commit is contained in:
Mary Guillemard 2024-06-20 11:17:41 +02:00 • committed by Marge Bot
parent d853443a2e
commit 738e202dce
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/panfrost/vulkan/jm/panvk_cmd_buffer.h
View file

@ -208,9 +208,6 @@ void panvk_per_arch(cmd_alloc_tls_desc)(struct panvk_cmd_buffer *cmdbuf,
void panvk_per_arch(cmd_prepare_tiler_context)(struct panvk_cmd_buffer *cmdbuf);
void panvk_per_arch(emit_viewport)(const VkViewport *viewport,
const VkRect2D *scissor, void *vpd);
void panvk_per_arch(cmd_preload_fb_after_batch_split)(
struct panvk_cmd_buffer *cmdbuf);

24
src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
View file

@ -720,12 +720,16 @@ panvk_draw_prepare_attributes(struct panvk_cmd_buffer *cmdbuf,
draw->vs.attribute_bufs = cmdbuf->state.gfx.vs.attrib_bufs;
}
void
panvk_per_arch(emit_viewport)(const VkViewport *viewport,
const VkRect2D *scissor, void *vpd)
static void
panvk_emit_viewport(const struct vk_viewport_state *vp, void *vpd)
{
assert(vp->viewport_count == 1);
const VkViewport *viewport = &vp->viewports[0];
const VkRect2D *scissor = &vp->scissors[0];
/* The spec says "width must be greater than 0.0" */
assert(viewport->x >= 0);
assert(viewport->width >= 0);
int minx = (int)viewport->x;
int maxx = (int)(viewport->x + viewport->width);
@ -743,6 +747,12 @@ panvk_per_arch(emit_viewport)(const VkViewport *viewport,
maxx = maxx > minx ? maxx - 1 : maxx;
maxy = maxy > miny ? maxy - 1 : maxy;
/* Clamp viewport scissor to valid range */
minx = CLAMP(minx, 0, UINT16_MAX);
maxx = CLAMP(maxx, 0, UINT16_MAX);
miny = CLAMP(miny, 0, UINT16_MAX);
maxy = CLAMP(maxy, 0, UINT16_MAX);
assert(viewport->minDepth >= 0.0f && viewport->minDepth <= 1.0f);
assert(viewport->maxDepth >= 0.0f && viewport->maxDepth <= 1.0f);
@ -761,14 +771,10 @@ panvk_draw_prepare_viewport(struct panvk_cmd_buffer *cmdbuf,
struct panvk_draw_info *draw)
{
if (is_dirty(cmdbuf, VP_VIEWPORTS) || is_dirty(cmdbuf, VP_SCISSORS)) {
const VkViewport *viewport =
&cmdbuf->vk.dynamic_graphics_state.vp.viewports[0];
const VkRect2D *scissor =
&cmdbuf->vk.dynamic_graphics_state.vp.scissors[0];
struct panfrost_ptr vp =
pan_pool_alloc_desc(&cmdbuf->desc_pool.base, VIEWPORT);
panvk_per_arch(emit_viewport)(viewport, scissor, vp.cpu);
panvk_emit_viewport(&cmdbuf->vk.dynamic_graphics_state.vp, vp.cpu);
cmdbuf->state.gfx.vpd = vp.gpu;
}