3 files changed, 8 insertions, 20 deletions
diff --git a/src/gallium/drivers/svga/svga_shader.c b/src/gallium/drivers/svga/svga_shader.c
index 6b6b441cb82..46efa07df2d 100644
--- a/src/gallium/drivers/svga/svga_shader.c
+++ b/src/gallium/drivers/svga/svga_shader.c
@@ -45,13 +45,20 @@ svga_define_shader(struct svga_context *svga,
 
    if (svga_have_gb_objects(svga)) {
       struct svga_winsys_screen *sws = svga_screen(svga->pipe.screen)->sws;
+      enum pipe_error ret;
 
       variant->gb_shader = sws->shader_create(sws, type,
                                               variant->tokens, codeLen);
       if (!variant->gb_shader)
          return PIPE_ERROR_OUT_OF_MEMORY;
 
-      return PIPE_OK;
+      ret = SVGA3D_BindGBShader(svga->swc, variant->gb_shader);
+      if (ret != PIPE_OK) {
+         sws->shader_destroy(sws, variant->gb_shader);
+         variant->gb_shader = NULL;
+      }
+
+      return ret;
    }
    else {
       enum pipe_error ret;
diff --git a/src/gallium/drivers/svga/svga_state_fs.c b/src/gallium/drivers/svga/svga_state_fs.c
index 8f419fa69ac..e714c078405 100644
--- a/src/gallium/drivers/svga/svga_state_fs.c
+++ b/src/gallium/drivers/svga/svga_state_fs.c
@@ -402,14 +402,6 @@ emit_hw_fs(struct svga_context *svga, unsigned dirty)
 
    if (variant != svga->state.hw_draw.fs) {
       if (svga_have_gb_objects(svga)) {
-         /*
-          * Bind is necessary here only because pipebuffer_fenced may move
-          * the shader contents around....
-          */
-         ret = SVGA3D_BindGBShader(svga->swc, variant->gb_shader);
-         if (ret != PIPE_OK)
-            return ret;
-
          ret = SVGA3D_SetGBShader(svga->swc, SVGA3D_SHADERTYPE_PS,
                                   variant->gb_shader);
          if (ret != PIPE_OK)
diff --git a/src/gallium/drivers/svga/svga_state_vs.c b/src/gallium/drivers/svga/svga_state_vs.c
index 125903b386a..545c9d7420f 100644
--- a/src/gallium/drivers/svga/svga_state_vs.c
+++ b/src/gallium/drivers/svga/svga_state_vs.c
@@ -243,17 +243,6 @@ emit_hw_vs(struct svga_context *svga, unsigned dirty)
       if (svga_have_gb_objects(svga)) {
          struct svga_winsys_gb_shader *gbshader =
             variant ? variant->gb_shader : NULL;
-
-         /*
-          * Bind is necessary here only because pipebuffer_fenced may move
-          * the shader contents around....
-          */
-         if (gbshader) {
-            ret = SVGA3D_BindGBShader(svga->swc, gbshader);
-            if (ret != PIPE_OK)
-               return ret;
-         }
-
          ret = SVGA3D_SetGBShader(svga->swc, SVGA3D_SHADERTYPE_VS, gbshader);
          if (ret != PIPE_OK)
             return ret;