Module: Mesa Branch: main Commit: 74266753634a6928d7c8497783dcd315d5667eec URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=74266753634a6928d7c8497783dcd315d5667eec
Author: Charmaine Lee <[email protected]> Date: Wed Aug 10 21:52:19 2022 -0700 svga: compare graphics shader stages against COMPUTE This patch fixes the graphics shader stage comparisons that are left out in commit 9bbf235fd9d. Fixes: 9bbf235fd9d ("svga: compare shader type against compute not tess eval") Reviewed-by: Roland Scheidegger <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18004> --- src/gallium/drivers/svga/svga_draw.c | 24 ++++++++++++------------ src/gallium/drivers/svga/svga_state_sampler.c | 2 +- src/gallium/drivers/svga/svga_state_uav.c | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c index 284622762d3..0f86cb7bd41 100644 --- a/src/gallium/drivers/svga/svga_draw.c +++ b/src/gallium/drivers/svga/svga_draw.c @@ -357,15 +357,15 @@ svga_validate_sampler_resources(struct svga_context *svga, if (pipe_type == SVGA_PIPE_GRAPHICS) { first_shader = PIPE_SHADER_VERTEX; - last_shader = PIPE_SHADER_TESS_EVAL; + last_shader = PIPE_SHADER_COMPUTE; } else { assert(svga_have_gl43(svga)); first_shader = PIPE_SHADER_COMPUTE; - last_shader = PIPE_SHADER_COMPUTE; + last_shader = first_shader+1; } - for (shader = first_shader; shader <= last_shader; shader++) { + for (shader = first_shader; shader < last_shader; shader++) { unsigned count = svga->curr.num_sampler_views[shader]; unsigned i; struct svga_winsys_surface *surfaces[PIPE_MAX_SAMPLERS]; @@ -440,15 +440,15 @@ svga_validate_constant_buffers(struct svga_context *svga, if (pipe_type == SVGA_PIPE_GRAPHICS) { first_shader = PIPE_SHADER_VERTEX; - last_shader = PIPE_SHADER_TESS_EVAL; + last_shader = PIPE_SHADER_COMPUTE; } else { assert(svga_have_gl43(svga)); first_shader = PIPE_SHADER_COMPUTE; - last_shader = PIPE_SHADER_COMPUTE; + last_shader = first_shader + 1; } - for (shader = first_shader; shader <= last_shader; shader++) { + for (shader = first_shader; shader < last_shader; shader++) { enum pipe_error ret; struct svga_buffer *buffer; @@ -542,14 +542,14 @@ svga_validate_image_views(struct svga_context *svga, if (pipe_type == SVGA_PIPE_GRAPHICS) { first_shader = PIPE_SHADER_VERTEX; - last_shader = PIPE_SHADER_TESS_EVAL; + last_shader = PIPE_SHADER_COMPUTE; } else { first_shader = PIPE_SHADER_COMPUTE; - last_shader = PIPE_SHADER_COMPUTE; + last_shader = first_shader + 1; } - for (shader = first_shader; shader <= last_shader; shader++) { + for (shader = first_shader; shader < last_shader; shader++) { ret = svga_validate_image_view_resources(svga, svga->state.hw_draw.num_image_views[shader], &svga->state.hw_draw.image_views[shader][0], rebind); @@ -581,14 +581,14 @@ svga_validate_shader_buffers(struct svga_context *svga, if (pipe_type == SVGA_PIPE_GRAPHICS) { first_shader = PIPE_SHADER_VERTEX; - last_shader = PIPE_SHADER_TESS_EVAL; + last_shader = PIPE_SHADER_COMPUTE; } else { first_shader = PIPE_SHADER_COMPUTE; - last_shader = PIPE_SHADER_COMPUTE; + last_shader = first_shader + 1; } - for (shader = first_shader; shader <= last_shader; shader++) { + for (shader = first_shader; shader < last_shader; shader++) { ret = svga_validate_shader_buffer_resources(svga, svga->state.hw_draw.num_shader_buffers[shader], &svga->state.hw_draw.shader_buffers[shader][0], rebind); diff --git a/src/gallium/drivers/svga/svga_state_sampler.c b/src/gallium/drivers/svga/svga_state_sampler.c index 97db0082e21..134b492767a 100644 --- a/src/gallium/drivers/svga/svga_state_sampler.c +++ b/src/gallium/drivers/svga/svga_state_sampler.c @@ -396,7 +396,7 @@ update_samplers(struct svga_context *svga, uint64_t dirty ) assert(svga_have_vgpu10(svga)); - for (shader = PIPE_SHADER_VERTEX; shader <= PIPE_SHADER_COMPUTE; shader++) { + for (shader = PIPE_SHADER_VERTEX; shader < PIPE_SHADER_COMPUTE; shader++) { const unsigned count = svga->curr.num_samplers[shader]; SVGA3dSamplerId ids[PIPE_MAX_SAMPLERS*2]; unsigned i; diff --git a/src/gallium/drivers/svga/svga_state_uav.c b/src/gallium/drivers/svga/svga_state_uav.c index a4da2c84229..547c8144982 100644 --- a/src/gallium/drivers/svga/svga_state_uav.c +++ b/src/gallium/drivers/svga/svga_state_uav.c @@ -363,14 +363,14 @@ svga_create_uav_list(struct svga_context *svga, if (pipe_type == SVGA_PIPE_GRAPHICS) { first_shader = PIPE_SHADER_VERTEX; - last_shader = PIPE_SHADER_TESS_EVAL; + last_shader = PIPE_SHADER_COMPUTE; } else { first_shader = PIPE_SHADER_COMPUTE; - last_shader = PIPE_SHADER_COMPUTE; + last_shader = first_shader + 1; } for (enum pipe_shader_type shader = first_shader; - shader <= last_shader; shader++) { + shader < last_shader; shader++) { unsigned num_image_views = svga->curr.num_image_views[shader]; unsigned num_shader_buffers = svga->curr.num_shader_buffers[shader]; @@ -600,14 +600,14 @@ svga_save_uav_state(struct svga_context *svga, if (pipe_type == SVGA_PIPE_GRAPHICS) { first_shader = PIPE_SHADER_VERTEX; - last_shader = PIPE_SHADER_TESS_EVAL; + last_shader = PIPE_SHADER_COMPUTE; } else { first_shader = PIPE_SHADER_COMPUTE; - last_shader = PIPE_SHADER_COMPUTE; + last_shader = first_shader + 1; } for (enum pipe_shader_type shader = first_shader; - shader <= last_shader; shader++) { + shader < last_shader; shader++) { /** * Save the current shader images
