[Mesa-dev] [PATCH 4/4] mesa: Add missing include guards

[Brian Paul]

For the series, Reviewed-by: Brian Paul <brianp at vmware.com>

I'll push these for you.

-Brian


On 10/29/2018 03:51 PM, janisozaur at gmail.com wrote:
> From: Michał Janiszewski <janisozaur+signed at gmail.com>
> 
> Signed-off-by: Michał Janiszewski <janisozaur+signed at gmail.com>
> ---
>   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 +++++
>   4 files changed, 20 insertions(+)
> 
> 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
>