mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 13:50:08 +02:00
42 lines
1.5 KiB
Plaintext
42 lines
1.5 KiB
Plaintext
From 322b34877fbeefdb0d25c04c6c43ab1d335fe666 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/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
|
index 30ef37c..28d7a0d 100644
|
|
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
|
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
|
@@ -110,7 +110,7 @@ static LLVMEnsureMultithreaded lLVMEnsureMultithreaded;
|
|
|
|
}
|
|
|
|
-static once_flag init_native_targets_once_flag;
|
|
+static once_flag init_native_targets_once_flag = ONCE_FLAG_INIT;
|
|
|
|
static void init_native_targets()
|
|
{
|
|
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
|
|
|