Mesa (master): svga: move variant->fs_shadow_compare_units assignment

Brian Paul brianp at kemper.freedesktop.org
Wed Dec 27 18:35:23 UTC 2017


Module: Mesa
Branch: master
Commit: 3e59e442c3a668628bc780a6834059ed69afacb2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e59e442c3a668628bc780a6834059ed69afacb2

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Dec 27 11:05:52 2017 -0700

svga: move variant->fs_shadow_compare_units assignment

Fixes a crash since the variant object isn't allocated until later
in the function.  Not sure how this got through.

Reviewed-by: Charmaine Lee <charmainel at vmware.com>

---

 src/gallium/drivers/svga/svga_tgsi_vgpu10.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
index 3e4a6eddb4..2f16935afd 100644
--- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
+++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
@@ -6550,8 +6550,6 @@ svga_tgsi_vgpu10_translate(struct svga_context *svga,
       }
    }
 
-   variant->fs_shadow_compare_units = emit->fs.shadow_compare_units;
-
    if (SVGA_DEBUG & DEBUG_TGSI) {
       debug_printf("#####################################\n");
       debug_printf("### TGSI Shader %u\n", shader->id);
@@ -6666,6 +6664,8 @@ svga_tgsi_vgpu10_translate(struct svga_context *svga,
     */
    variant->uses_flat_interp = emit->uses_flat_interp;
 
+   variant->fs_shadow_compare_units = emit->fs.shadow_compare_units;
+
    if (tokens != shader->tokens) {
       tgsi_free_tokens(tokens);
    }




More information about the mesa-commit mailing list