mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-11 06:10:06 +02:00
49 lines
1.5 KiB
Plaintext
49 lines
1.5 KiB
Plaintext
From 60ca041bf3060a3c342f0b11498f9e0f615339ee Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sat, 19 Nov 2016 10:30:12 +0000
|
|
Subject: Haiku patch
|
|
|
|
|
|
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
|
|
index 7da7f53..236be36 100644
|
|
--- a/src/gallium/auxiliary/util/u_debug.h
|
|
+++ b/src/gallium/auxiliary/util/u_debug.h
|
|
@@ -38,14 +38,13 @@
|
|
#ifndef U_DEBUG_H_
|
|
#define U_DEBUG_H_
|
|
|
|
+#include "os/os_misc.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"
|
|
#include "pipe/p_defines.h"
|
|
|
|
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
|
|
index 89dd547..be73b29 100644
|
|
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
|
|
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
|
|
@@ -105,8 +105,12 @@ hgl_winsys_convert_cs(enum pipe_format format)
|
|
|
|
static struct sw_displaytarget*
|
|
hgl_winsys_displaytarget_create(struct sw_winsys* winsys,
|
|
- unsigned textureUsage, enum pipe_format format, unsigned width,
|
|
- unsigned height, unsigned alignment, unsigned* stride)
|
|
+ unsigned tex_usage,
|
|
+ enum pipe_format format,
|
|
+ unsigned width, unsigned height,
|
|
+ unsigned alignment,
|
|
+ const void *front_private,
|
|
+ unsigned *stride)
|
|
{
|
|
struct haiku_displaytarget* haikuDisplayTarget
|
|
= CALLOC_STRUCT(haiku_displaytarget);
|
|
--
|
|
2.2.2
|
|
|