summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2020-09-22 13:04:47 -0700
committerIan Romanick <ian.d.romanick@intel.com>2020-09-28 11:43:04 -0700
commit86bab92aa4aac91e8d8730e7344e9bbb44e062ab (patch)
tree2ef8cf5a16fa8cc981abfa36c4f6002fa371bb39
parent92f08860c9718c4e62fe94146f53a04fe1656f2e (diff)
intel/compiler: Don't fallback to vec4 when scalar GS compile fails [v2]
v2: Add missing error string handling. Noticed by Jason. Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Matt Turner <mattst88@gmail.com> [v1] Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6826>
-rw-r--r--src/intel/compiler/brw_vec4_gs_visitor.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp
index 05cbab26620..615b2966805 100644
--- a/src/intel/compiler/brw_vec4_gs_visitor.cpp
+++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp
@@ -872,6 +872,11 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
g.add_const_data(nir->constant_data, nir->constant_data_size);
return g.get_assembly();
}
+
+ if (error_str)
+ *error_str = ralloc_strdup(mem_ctx, v.fail_msg);
+
+ return NULL;
}
if (compiler->devinfo->gen >= 7) {