Mesa (master): gallium/swrast: fixup build breakage and warnings
Dave Airlie
airlied at kemper.freedesktop.org
Sat Oct 31 06:17:04 UTC 2015
Module: Mesa
Branch: master
Commit: 7153b12651f4d6e3b160a8d577a084a32be08c40
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7153b12651f4d6e3b160a8d577a084a32be08c40
Author: Dave Airlie <airlied at gmail.com>
Date: Sat Oct 31 16:11:29 2015 +1000
gallium/swrast: fixup build breakage and warnings
The front buffer rendering changes broke an interface, I didn't
fix up all of them.
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
src/gallium/winsys/sw/gdi/gdi_sw_winsys.c | 1 +
src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c | 1 +
src/gallium/winsys/sw/null/null_sw_winsys.c | 1 +
src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c | 1 +
src/gallium/winsys/sw/xlib/xlib_sw_winsys.c | 1 +
src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c | 2 +-
6 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
index dc725f4..16f6418 100644
--- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
+++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
@@ -124,6 +124,7 @@ gdi_sw_displaytarget_create(struct sw_winsys *winsys,
enum pipe_format format,
unsigned width, unsigned height,
unsigned alignment,
+ const void *front_private,
unsigned *stride)
{
struct gdi_sw_displaytarget *gdt;
diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index 900c49f..1e85971 100644
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -111,6 +111,7 @@ kms_sw_displaytarget_create(struct sw_winsys *ws,
enum pipe_format format,
unsigned width, unsigned height,
unsigned alignment,
+ const void *front_private,
unsigned *stride)
{
struct kms_sw_winsys *kms_sw = kms_sw_winsys(ws);
diff --git a/src/gallium/winsys/sw/null/null_sw_winsys.c b/src/gallium/winsys/sw/null/null_sw_winsys.c
index 9c8b3ec..10ce250 100644
--- a/src/gallium/winsys/sw/null/null_sw_winsys.c
+++ b/src/gallium/winsys/sw/null/null_sw_winsys.c
@@ -84,6 +84,7 @@ null_sw_displaytarget_create(struct sw_winsys *winsys,
enum pipe_format format,
unsigned width, unsigned height,
unsigned alignment,
+ const void *front_private,
unsigned *stride)
{
fprintf(stderr, "null_sw_displaytarget_create() returning NULL\n");
diff --git a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
index 5c17993..4d87a58 100644
--- a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
+++ b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
@@ -148,6 +148,7 @@ wsw_dt_create(struct sw_winsys *ws,
enum pipe_format format,
unsigned width, unsigned height,
unsigned alignment,
+ const void *front_private,
unsigned *stride)
{
struct wrapper_sw_winsys *wsw = wrapper_sw_winsys(ws);
diff --git a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
index 515ecd9..cc2a3de 100644
--- a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
+++ b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
@@ -391,6 +391,7 @@ xlib_displaytarget_create(struct sw_winsys *winsys,
enum pipe_format format,
unsigned width, unsigned height,
unsigned alignment,
+ const void *front_private,
unsigned *stride)
{
struct xlib_displaytarget *xlib_dt;
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
index 7c2236f..b19c456 100644
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
@@ -225,7 +225,7 @@ virgl_vtest_winsys_resource_create(struct virgl_winsys *vws,
if (bind & (VIRGL_BIND_DISPLAY_TARGET | VIRGL_BIND_SCANOUT)) {
res->dt = vtws->sws->displaytarget_create(vtws->sws, bind, format,
- width, height, 64,
+ width, height, 64, NULL,
&res->stride);
} else {
More information about the mesa-commit
mailing list