gallium: do not wrap header inclusion in
Add one missing extern C guard within include/pipe/p_video_enums.h, and remove the wrapping throughout gallium. On Haiku one could even use the gallium debug_printf() although that's another topic. v2: Leave dbghelp.h as is (Jose) Cc: Jose Fonseca <jfonseca@vmware.com> Cc: Brian Paul <brianp@vmware.com> Cc: Alexander von Gluck IV <kallisti5@unixzen.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
parent
69d389c52f
commit
373f118c6c
|
@ -28,12 +28,12 @@
|
|||
#ifndef TGSI_SANITY_H
|
||||
#define TGSI_SANITY_H
|
||||
|
||||
#include "pipe/p_compiler.h"
|
||||
|
||||
#if defined __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "pipe/p_compiler.h"
|
||||
|
||||
struct tgsi_token;
|
||||
|
||||
/* Check the given token stream for errors and common mistakes.
|
||||
|
|
|
@ -28,12 +28,12 @@
|
|||
#ifndef TGSI_TEXT_H
|
||||
#define TGSI_TEXT_H
|
||||
|
||||
#include "pipe/p_compiler.h"
|
||||
|
||||
#if defined __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "pipe/p_compiler.h"
|
||||
|
||||
struct tgsi_token;
|
||||
|
||||
boolean
|
||||
|
|
|
@ -39,6 +39,11 @@
|
|||
#define U_DEBUG_H_
|
||||
|
||||
|
||||
#if defined(PIPE_OS_HAIKU)
|
||||
/* Haiku provides debug_printf in libroot with OS.h */
|
||||
#include <OS.h>
|
||||
#endif
|
||||
|
||||
#include "os/os_misc.h"
|
||||
|
||||
#include "pipe/p_format.h"
|
||||
|
@ -94,9 +99,6 @@ debug_printf(const char *format, ...)
|
|||
(void) format; /* silence warning */
|
||||
#endif
|
||||
}
|
||||
#else /* is Haiku */
|
||||
/* Haiku provides debug_printf in libroot with OS.h */
|
||||
#include <OS.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include "pipe/p_compiler.h"
|
||||
#include "pipe/p_context.h"
|
||||
|
||||
#include "util/u_draw.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -40,8 +41,6 @@ extern "C" {
|
|||
struct pipe_resource;
|
||||
struct cso_context;
|
||||
|
||||
#include "util/u_draw.h"
|
||||
|
||||
extern void
|
||||
util_draw_vertex_buffer(struct pipe_context *pipe, struct cso_context *cso,
|
||||
struct pipe_resource *vbuf, uint vbuf_slot,
|
||||
|
|
|
@ -28,12 +28,12 @@
|
|||
#ifndef U_HELPERS_H
|
||||
#define U_HELPERS_H
|
||||
|
||||
#include "pipe/p_state.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "pipe/p_state.h"
|
||||
|
||||
void util_set_vertex_buffers_mask(struct pipe_vertex_buffer *dst,
|
||||
uint32_t *enabled_buffers,
|
||||
const struct pipe_vertex_buffer *src,
|
||||
|
|
|
@ -28,10 +28,6 @@
|
|||
#ifndef U_VIDEO_H
|
||||
#define U_VIDEO_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "pipe/p_defines.h"
|
||||
#include "pipe/p_video_enums.h"
|
||||
|
||||
|
@ -40,6 +36,10 @@ extern "C" {
|
|||
#include "util/u_debug.h"
|
||||
#include "util/u_math.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
static inline enum pipe_video_format
|
||||
u_reduce_video_profile(enum pipe_video_profile profile)
|
||||
{
|
||||
|
|
|
@ -29,12 +29,12 @@
|
|||
#ifndef PIPE_FORMAT_H
|
||||
#define PIPE_FORMAT_H
|
||||
|
||||
#include "p_config.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "p_config.h"
|
||||
|
||||
/**
|
||||
* Formats for textures, surfaces and vertex data
|
||||
*/
|
||||
|
|
|
@ -28,12 +28,12 @@
|
|||
#ifndef PIPE_VIDEO_CONTEXT_H
|
||||
#define PIPE_VIDEO_CONTEXT_H
|
||||
|
||||
#include "pipe/p_video_state.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "pipe/p_video_state.h"
|
||||
|
||||
struct pipe_screen;
|
||||
struct pipe_surface;
|
||||
struct pipe_macroblock;
|
||||
|
|
|
@ -28,6 +28,10 @@
|
|||
#ifndef PIPE_VIDEO_ENUMS_H
|
||||
#define PIPE_VIDEO_ENUMS_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
enum pipe_video_format
|
||||
{
|
||||
PIPE_VIDEO_FORMAT_UNKNOWN = 0,
|
||||
|
@ -87,4 +91,8 @@ enum pipe_video_entrypoint
|
|||
PIPE_VIDEO_ENTRYPOINT_ENCODE
|
||||
};
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* PIPE_VIDEO_ENUMS_H */
|
||||
|
|
Loading…
Reference in New Issue