From 041f8ae9f6bab39361263f6c767ea5294f1aa011 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 22 Jun 2017 12:58:39 -0600 Subject: [PATCH] svga: check return value from svga_set_shader( SVGA3D_SHADERTYPE_GS, NULL) If the call fails we need to flush the command buffer and retry. In this case, we were failing to unbind the GS which led to subsequent errors. This fixes a bug replaying a Cinebench R15 apitrace in a Linux guest. VMware bug 1894451 cc: mesa-stable@lists.freedesktop.org Reviewed-by: Charmaine Lee --- src/gallium/drivers/svga/svga_state_gs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/svga/svga_state_gs.c b/src/gallium/drivers/svga/svga_state_gs.c index cff11ad5c3f..217463882f1 100644 --- a/src/gallium/drivers/svga/svga_state_gs.c +++ b/src/gallium/drivers/svga/svga_state_gs.c @@ -190,6 +190,8 @@ emit_hw_gs(struct svga_context *svga, unsigned dirty) * Needs to unbind the geometry shader. */ ret = svga_set_shader(svga, SVGA3D_SHADERTYPE_GS, NULL); + if (ret != PIPE_OK) + goto done; svga->state.hw_draw.gs = NULL; } goto done; -- 2.30.2