Mesa (master): tgsi: include struct definitions for tgsi_build declarations

Rob Herring robh at kemper.freedesktop.org
Wed Jan 10 20:56:26 UTC 2018


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

Author: Rob Herring <robh at kernel.org>
Date:   Mon Jan  8 15:17:48 2018 -0600

tgsi: include struct definitions for tgsi_build declarations

Many of the functions declared in tgsi_build.h return structs (not struct
pointers). Therefore the full struct definitions are needed to avoid
warnings or errors:

In file included from src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp:23:
external/mesa3d/src/gallium/auxiliary/tgsi/tgsi_build.h:47:1: error: 'tgsi_build_header' has C-linkage specified, but returns incomplete type 'struct tgsi_header' which could be incompatible with C [-Werror,-Wreturn-type-c-linkage]

This error shows up on Android builds using clang and -Werror.

Cc: Ilia Mirkin <imirkin at alum.mit.edu>
Signed-off-by: Rob Herring <robh at kernel.org>

---

 src/gallium/auxiliary/tgsi/tgsi_build.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.h b/src/gallium/auxiliary/tgsi/tgsi_build.h
index 53f31932c0..31de76fe53 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_build.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.h
@@ -28,11 +28,7 @@
 #ifndef TGSI_BUILD_H
 #define TGSI_BUILD_H
 
-
-struct tgsi_token;
-struct tgsi_full_dst_register;
-struct tgsi_full_src_register;
-
+#include "tgsi/tgsi_parse.h"
 
 #if defined __cplusplus
 extern "C" {




More information about the mesa-commit mailing list