i965: Return the correct value type from brw_compile_gs()
authorEduardo Lima Mitev <elima@igalia.com>
Tue, 17 Nov 2015 08:49:43 +0000 (09:49 +0100)
committerEduardo Lima Mitev <elima@igalia.com>
Tue, 17 Nov 2015 11:50:09 +0000 (12:50 +0100)
brw_compile_gs() should return a pointer to unsigned, but it is returning the
bool 'false' at some point, hence annoying us with a compiler warning:

In function 'const unsigned int* brw::brw_compile_gs(const brw_compiler*,
   void*, void*, const brw_gs_prog_key*, brw_gs_prog_data*, const nir_shader*,
   gl_shader_program*, int, unsigned int*, char**)':

brw_vec4_gs_visitor.cpp:776:14: warning: converting 'false' to pointer type
                                'const unsigned int*' [-Wconversion-null]
                                return false;
                                       ^
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp

index 81353aeed7ef9447429e372361ea242b806250b0..0c49865eee2e94e7ea285dd5543b5777edb55fb0 100644 (file)
@@ -773,7 +773,7 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
    if (compiler->devinfo->gen == 6)
       max_output_size_bytes = GEN6_MAX_GS_URB_ENTRY_SIZE_BYTES;
    if (output_size_bytes > max_output_size_bytes)
-      return false;
+      return NULL;
 
 
    /* URB entry sizes are stored as a multiple of 64 bytes in gen7+ and