Mesa (master): i965: remove unnecessary null check

Timothy Arceri tarceri at kemper.freedesktop.org
Thu Jul 28 01:06:09 UTC 2016


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

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Thu Jul 28 10:24:57 2016 +1000

i965: remove unnecessary null check

We would have hit a segfault already if this could be null.

Fixes Coverity warning spotted by Matt.

Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_gs.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index 67a2480..dd1ec4b 100644
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -163,10 +163,7 @@ brw_codegen_gs_prog(struct brw_context *brw,
                      &prog_data, gs->Program->nir, prog,
                      st_index, &program_size, &error_str);
    if (program == NULL) {
-      if (prog) {
-         ralloc_strcat(&prog->InfoLog, error_str);
-      }
-
+      ralloc_strcat(&prog->InfoLog, error_str);
       _mesa_problem(NULL, "Failed to compile geometry shader: %s\n", error_str);
 
       ralloc_free(mem_ctx);




More information about the mesa-commit mailing list