From: Michał Janiszewski <janisozaur+sig...@gmail.com> Signed-off-by: Michał Janiszewski <janisozaur+sig...@gmail.com> --- src/compiler/glsl/ir_builder.h | 5 +++++ src/gallium/drivers/svga/include/svga3d_surfacedefs.h | 5 +++++ src/gallium/winsys/svga/drm/vmw_shader.h | 1 + src/glx/dri2_priv.h | 5 +++++ src/glx/drisw_priv.h | 5 +++++ src/glx/glx_error.h | 6 ++++++ src/mesa/main/texcompress_bptc_tmp.h | 5 +++++ src/mesa/main/texcompress_s3tc_tmp.h | 5 +++++ src/mesa/state_tracker/st_glsl_to_tgsi.h | 5 +++++ src/mesa/state_tracker/st_shader_cache.h | 5 +++++ 10 files changed, 47 insertions(+)
diff --git a/src/compiler/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h index ff1ff709c9..9309039f9d 100644 --- a/src/compiler/glsl/ir_builder.h +++ b/src/compiler/glsl/ir_builder.h @@ -21,6 +21,9 @@ * IN THE SOFTWARE. */ +#ifndef IR_BUILDER_H +#define IR_BUILDER_H + #include "ir.h" namespace ir_builder { @@ -236,3 +239,5 @@ ir_if *if_tree(operand condition, ir_instruction *else_branch); } /* namespace ir_builder */ + +#endif diff --git a/src/gallium/drivers/svga/include/svga3d_surfacedefs.h b/src/gallium/drivers/svga/include/svga3d_surfacedefs.h index 9054e72207..578b38dda7 100644 --- a/src/gallium/drivers/svga/include/svga3d_surfacedefs.h +++ b/src/gallium/drivers/svga/include/svga3d_surfacedefs.h @@ -31,6 +31,9 @@ * Surface/format/image helper code. */ +#ifndef SVGA3D_SURFACEDEFS_H +#define SVGA3D_SURFACEDEFS_H + #include "svga3d_reg.h" #define max_t(type, x, y) ((x) > (y) ? (x) : (y)) @@ -1145,3 +1148,5 @@ svga3dsurface_get_pixel_offset(SVGA3dSurfaceFormat format, x / bw * desc->bytes_per_block); return offset; } + +#endif diff --git a/src/gallium/winsys/svga/drm/vmw_shader.h b/src/gallium/winsys/svga/drm/vmw_shader.h index c9a3638bcc..ae557bcc8e 100644 --- a/src/gallium/winsys/svga/drm/vmw_shader.h +++ b/src/gallium/winsys/svga/drm/vmw_shader.h @@ -32,6 +32,7 @@ */ #ifndef VMW_SHADER_H_ +#define VMW_SHADER_H_ #include "pipe/p_compiler.h" #include "util/u_atomic.h" diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h index 30ab2cdd87..a93551b146 100644 --- a/src/glx/dri2_priv.h +++ b/src/glx/dri2_priv.h @@ -30,6 +30,9 @@ * Kristian Høgsberg (k...@redhat.com) */ +#ifndef DRI2_PRIV_H +#define DRI2_PRIV_H + #ifdef __cplusplus extern "C" { #endif @@ -82,3 +85,5 @@ dri2_interop_export_object(struct glx_context *ctx, #ifdef __cplusplus } #endif + +#endif diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h index a670da2d33..259fc864f6 100644 --- a/src/glx/drisw_priv.h +++ b/src/glx/drisw_priv.h @@ -23,6 +23,9 @@ * SOFTWARE. */ +#ifndef DRISW_PRIV_H +#define DRISW_PRIV_H + #include <X11/extensions/XShm.h> struct drisw_display @@ -73,3 +76,5 @@ drisw_query_renderer_integer(struct glx_screen *base, int attribute, _X_HIDDEN int drisw_query_renderer_string(struct glx_screen *base, int attribute, const char **value); + +#endif diff --git a/src/glx/glx_error.h b/src/glx/glx_error.h index 5d3992672e..6a2f32aa56 100644 --- a/src/glx/glx_error.h +++ b/src/glx/glx_error.h @@ -26,6 +26,10 @@ promote the sale, use or other dealings in this Software without prior written authorization. */ + +#ifndef GLX_ERROR_H +#define GLX_ERROR_H + #include <stdbool.h> #include <stdint.h> #include <X11/Xlib.h> @@ -45,3 +49,5 @@ _X_HIDDEN void __glXSendErrorForXcb(Display * dpy, #ifdef __cplusplus } #endif + +#endif diff --git a/src/mesa/main/texcompress_bptc_tmp.h b/src/mesa/main/texcompress_bptc_tmp.h index 3c4ea2c013..90837d6af3 100644 --- a/src/mesa/main/texcompress_bptc_tmp.h +++ b/src/mesa/main/texcompress_bptc_tmp.h @@ -25,6 +25,9 @@ * Included by texcompress_bptc and gallium to define BPTC decoding routines. */ +#ifndef TEXCOMPRESS_BPTC_TMP_H +#define TEXCOMPRESS_BPTC_TMP_H + #include "util/format_srgb.h" #include "util/half_float.h" #include "macros.h" @@ -1741,3 +1744,5 @@ compress_rgb_float(int width, int height, dst += dst_row_diff; } } + +#endif diff --git a/src/mesa/main/texcompress_s3tc_tmp.h b/src/mesa/main/texcompress_s3tc_tmp.h index 92316a74dd..dbf8c871b7 100644 --- a/src/mesa/main/texcompress_s3tc_tmp.h +++ b/src/mesa/main/texcompress_s3tc_tmp.h @@ -22,6 +22,9 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifndef TEXCOMPRESS_S3TC_TMP_H +#define TEXCOMPRESS_S3TC_TMP_H + #ifdef __APPLE__ #include <OpenGL/gl.h> #else @@ -987,3 +990,5 @@ static void tx_compress_dxtn(GLint srccomps, GLint width, GLint height, const GL return; } } + +#endif diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.h b/src/mesa/state_tracker/st_glsl_to_tgsi.h index 8ccfff9bd3..277bc947e2 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.h +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.h @@ -22,6 +22,9 @@ * DEALINGS IN THE SOFTWARE. */ +#ifndef ST_GLSL_TO_TGSI_H +#define ST_GLSL_TO_TGSI_H + #include "pipe/p_defines.h" #include "pipe/p_shader_tokens.h" #include "main/mtypes.h" @@ -73,3 +76,5 @@ _mesa_sysval_to_semantic(unsigned sysval); #ifdef __cplusplus } #endif + +#endif diff --git a/src/mesa/state_tracker/st_shader_cache.h b/src/mesa/state_tracker/st_shader_cache.h index 5b0bff7b2f..67cc084d60 100644 --- a/src/mesa/state_tracker/st_shader_cache.h +++ b/src/mesa/state_tracker/st_shader_cache.h @@ -21,6 +21,9 @@ * DEALINGS IN THE SOFTWARE. */ +#ifndef ST_SHADER_CACHE_H +#define ST_SHADER_CACHE_H + #include "st_context.h" #include "compiler/blob.h" #include "main/mtypes.h" @@ -73,3 +76,5 @@ st_store_ir_in_disk_cache(struct st_context *st, struct gl_program *prog, #ifdef __cplusplus } #endif + +#endif -- 2.19.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev