[PATCH 3/3] remove previous craete/release_buffer implementation
Halley Zhao
halley.zhao at intel.com
Thu Apr 19 02:35:27 PDT 2012
from dri
---
src/egl/drivers/dri2/egl_dri2.c | 42 -----------------
src/egl/wayland/wayland-drm/wayland-drm.h | 6 ---
.../egl/common/native_wayland_drm_bufmgr_helper.c | 48 -----------------=
---
.../egl/common/native_wayland_drm_bufmgr_helper.h | 9 ----
src/gallium/state_trackers/egl/drm/native_drm.c | 2 -
.../state_trackers/egl/wayland/native_drm.c | 2 -
src/gallium/state_trackers/egl/x11/native_dri2.c | 2 -
7 files changed, 0 insertions(+), 111 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri=
2.c
index c6de687..98d4f42 100755
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1260,50 +1260,8 @@ dri2_export_drm_image_mesa(_EGLDriver *drv, _EGLDisp=
lay *disp, _EGLImage *img,
}
#ifdef HAVE_WAYLAND_PLATFORM
-
-static void *
-dri2_wl_reference_buffer(void *user_data, uint32_t name,
- int32_t width, int32_t heigh=
t,
- uint32_t stride, uint32_t fo=
rmat)
-{
- _EGLDisplay *disp =3D user_data;
- struct dri2_egl_display *dri2_dpy =3D dri2_egl_display(disp);
- __DRIimage *image;
- int dri_format;
-
- switch (format) {
- case WL_GBM_FORMAT_ARGB8888:
- dri_format =3D__DRI_IMAGE_FORMAT_ARGB8888;
- break;
- case WL_GBM_FORMAT_XRGB8888:
- dri_format =3D __DRI_IMAGE_FORMAT_XRGB8888;
- break;
- default:
- return NULL;
- }
-
- image =3D dri2_dpy->image->createImageFromName(dri2_dpy->dri_screen,
- =
width, height,
- =
dri_format, name, stride / 4,
- =
NULL);
-
- return image;
-}
-
-static void
-dri2_wl_release_buffer(void *user_data, void *buffer)
-{
- _EGLDisplay *disp =3D user_data;
- __DRIimage *image =3D buffer;
- struct dri2_egl_display *dri2_dpy =3D dri2_egl_display(disp);
-
- dri2_dpy->image->destroyImage(image);
-}
-
static struct wayland_gbm_callbacks wl_gbm_callbacks =3D {
.authenticate =3D NULL,
- .reference_buffer =3D dri2_wl_reference_buffer,
- .release_buffer =3D dri2_wl_release_buffer
};
static EGLBoolean
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.h b/src/egl/wayland/wa=
yland-drm/wayland-drm.h
index 0904245..8bcd5aa 100755
--- a/src/egl/wayland/wayland-drm/wayland-drm.h
+++ b/src/egl/wayland/wayland-drm/wayland-drm.h
@@ -8,12 +8,6 @@ struct wl_gbm;
struct wayland_gbm_callbacks {
int (*authenticate)(void *user_data, uint32_t id);
-
- void *(*reference_buffer)(void *user_data, uint32_t name,
- int32_t wi=
dth, int32_t height,
- uint32_t s=
tride, uint32_t format);
-
- void (*release_buffer)(void *user_data, void *buffer);
};
struct wl_gbm *
diff --git a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmg=
r_helper.c b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmg=
r_helper.c
index d35cf47..e7f963f 100644
--- a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helpe=
r.c
+++ b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helpe=
r.c
@@ -12,54 +12,6 @@
#include "native_wayland_drm_bufmgr_helper.h"
-void *
-egl_g3d_wl_gbm_helper_reference_buffer(void *user_data, uint32_t name,
- int32_t width, int32_t height,
- uint32_t stride, uint32_t format)
-{
- struct native_display *ndpy =3D user_data;
- struct pipe_resource templ;
- struct winsys_handle wsh;
- enum pipe_format pf;
-
- switch (format) {
- case WL_GBM_FORMAT_ARGB8888:
- pf =3D PIPE_FORMAT_B8G8R8A8_UNORM;
- break;
- case WL_GBM_FORMAT_XRGB8888:
- pf =3D PIPE_FORMAT_B8G8R8X8_UNORM;
- break;
- default:
- pf =3D PIPE_FORMAT_NONE;
- break;
- }
-
- if (pf =3D=3D PIPE_FORMAT_NONE)
- return NULL;
-
- memset(&templ, 0, sizeof(templ));
- templ.target =3D PIPE_TEXTURE_2D;
- templ.format =3D pf;
- templ.bind =3D PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW;
- templ.width0 =3D width;
- templ.height0 =3D height;
- templ.depth0 =3D 1;
- templ.array_size =3D 1;
-
- memset(&wsh, 0, sizeof(wsh));
- wsh.handle =3D name;
- wsh.stride =3D stride;
-
- return ndpy->screen->resource_from_handle(ndpy->screen, &templ, &wsh);
-}
-
-void
-egl_g3d_wl_gbm_helper_unreference_buffer(void *user_data, void *buffer)
-{
- struct pipe_resource *resource =3D buffer;
-
- pipe_resource_reference(&resource, NULL);
-}
struct pipe_resource *
egl_g3d_wl_gbm_common_wl_buffer_get_resource(struct native_display *ndpy,
diff --git a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmg=
r_helper.h b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmg=
r_helper.h
index 4d9a41d..57867eb 100644
--- a/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helpe=
r.h
+++ b/src/gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helpe=
r.h
@@ -27,15 +27,6 @@
#define _NATIVE_WAYLAND_GBM_BUFMGR_HELPER_H_
#include "wayland-drm.h"
-
-void *
-egl_g3d_wl_gbm_helper_reference_buffer(void *user_data, uint32_t name,
- int32_t width, int32_t height,
- uint32_t stride, uint32_t format);
-
-void
-egl_g3d_wl_gbm_helper_unreference_buffer(void *user_data, void *buffer);
-
struct pipe_resource *
egl_g3d_wl_gbm_common_wl_buffer_get_resource(struct native_display *ndpy,
struct wl_buffer *buffer);
diff --git a/src/gallium/state_trackers/egl/drm/native_drm.c b/src/gallium/=
state_trackers/egl/drm/native_drm.c
index 4138b6d..041a37a 100755
--- a/src/gallium/state_trackers/egl/drm/native_drm.c
+++ b/src/gallium/state_trackers/egl/drm/native_drm.c
@@ -199,8 +199,6 @@ drm_display_authenticate(void *user_data, uint32_t magi=
c)
static struct wayland_gbm_callbacks wl_gbm_callbacks =3D {
drm_display_authenticate,
- egl_g3d_wl_gbm_helper_reference_buffer,
- egl_g3d_wl_gbm_helper_unreference_buffer
};
static boolean
diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gall=
ium/state_trackers/egl/wayland/native_drm.c
index a96cca8..3d277fe 100755
--- a/src/gallium/state_trackers/egl/wayland/native_drm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_drm.c
@@ -249,8 +249,6 @@ wayland_drm_display_authenticate(void *user_data, uint3=
2_t magic)
static struct wayland_gbm_callbacks wl_gbm_callbacks =3D {
wayland_drm_display_authenticate,
- egl_g3d_wl_gbm_helper_reference_buffer,
- egl_g3d_wl_gbm_helper_unreference_buffer
};
static boolean
diff --git a/src/gallium/state_trackers/egl/x11/native_dri2.c b/src/gallium=
/state_trackers/egl/x11/native_dri2.c
index 2c38938..bfc06fc 100755
--- a/src/gallium/state_trackers/egl/x11/native_dri2.c
+++ b/src/gallium/state_trackers/egl/x11/native_dri2.c
@@ -849,8 +849,6 @@ dri2_display_authenticate(void *user_data, uint32_t mag=
ic)
static struct wayland_gbm_callbacks wl_gbm_callbacks =3D {
dri2_display_authenticate,
- egl_g3d_wl_gbm_helper_reference_buffer,
- egl_g3d_wl_gbm_helper_unreference_buffer
};
static boolean
--
1.7.5.4
--_000_81DD1C3FC6BE1E4EAA454D486F8200440923DDSHSMSX101ccrcorpi_
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr=
osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:=
//www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
>
<meta name=3D"Generator" content=3D"Microsoft Word 12 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{mso-style-priority:99;
mso-style-link:"Balloon Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif";}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";}
span.EmailStyle19
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.EmailStyle20
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle21
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle22
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle23
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.25in 1.0in 1.25in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3D"EN-US" link=3D"blue" vlink=3D"purple">
<div class=3D"WordSection1">
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">Wayland-drm depends on=
callback functions of backend to create/destroy wl_buffer before, remove t=
hem now.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p> </o:p></spa=
n></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p> </o:p></spa=
n></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">From a1bbad6760af4d1c5=
237a2318a2e5f6f91a823fa Mon Sep 17 00:00:00 2001<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">From: Halley Zhao <=
halley.zhao at intel.com><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">Date: Thu, 19 Apr 2012=
17:35:27 +0800<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">Subject: [PATCH 3/3] r=
emove previous craete/release_buffer implementation<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">from dri<o:p></o:p></s=
pan></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p> </o:p></spa=
n></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">---<o:p></o:p></span><=
/p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">src/egl/drivers/dri2/e=
gl_dri2.c =
| 42 ---------=
--------<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">src/egl/wayland/waylan=
d-drm/wayland-drm.h |=
6 ---<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">.../egl/common/native_=
wayland_drm_bufmgr_helper.c | 48 --------------------<o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">.../egl/common/native_=
wayland_drm_bufmgr_helper.h | 9 ----<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">src/gallium/state_trac=
kers/egl/drm/native_drm.c | 2 -<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">.../state_trackers/egl=
/wayland/native_drm.c | &nbs=
p; 2 -<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">src/gallium/state_trac=
kers/egl/x11/native_dri2.c | 2 -<o:p></o:p></=
span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">7 files changed, 0 ins=
ertions(+), 111 deletions(-)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p> </o:p></spa=
n></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">diff --git a/src/egl/d=
rivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c<o:p></o:p></span><=
/p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">index c6de687..98d4f42=
100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--- a/src/egl/drivers/=
dri2/egl_dri2.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">+++ b/src/=
egl/drivers/dri2/egl_dri2.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">@@ -1260,50 +1260,=
8 @@ dri2_export_drm_image_mesa(_EGLDriver *drv, _EGLDisplay *disp, _EGLIma=
ge *img,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">}<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> #ifdef HAVE_WAYL=
AND_PLATFORM<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-static void *<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-dri2_wl_reference_buf=
fer(void *user_data, uint32_t name,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; =
int32_t width, int32_t height,<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; =
uint32_t stride, uint32_t format)<o:p></o:p></span=
></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-{<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- _EGLDisp=
lay *disp =3D user_data;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- struct d=
ri2_egl_display *dri2_dpy =3D dri2_egl_display(disp);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- __DRIima=
ge *image;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- int dri_=
format;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- switch (=
format) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- case WL_=
GBM_FORMAT_ARGB8888:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; dri_format =3D__DRI_IMAGE_FORMAT_ARGB8888;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; break;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- case WL_=
GBM_FORMAT_XRGB8888:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; dri_format =3D __DRI_IMAGE_FORMAT_XRGB8888;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; break;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- default:=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; return NULL;  =
;
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- }<o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- image =
=3D dri2_dpy->image->createImageFromName(dri2_dpy->dri_screen,<o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; =
&nb=
sp; =
&nb=
sp; =
width, height,
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; =
&nb=
sp; =
&nb=
sp; =
dri_format, name, stride / 4,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; =
&nb=
sp; =
&nb=
sp; =
NULL);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- return i=
mage;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-}<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-static void<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-dri2_wl_release_buffe=
r(void *user_data, void *buffer)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-{<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- _EGLDisp=
lay *disp =3D user_data;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- __DRIima=
ge *image =3D buffer;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- struct d=
ri2_egl_display *dri2_dpy =3D dri2_egl_display(disp);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- dri2_dpy=
->image->destroyImage(image);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-}<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">static struct wayland_=
gbm_callbacks wl_gbm_callbacks =3D {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> &nbs=
p; .authenticat=
e =3D NULL,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; .reference_buffer=
=3D dri2_wl_reference_buffer,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; .release_buffer =
=3D dri2_wl_release_buffer<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">};<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> static EGLBoolea=
n<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">diff --git a/src/egl/w=
ayland/wayland-drm/wayland-drm.h b/src/egl/wayland/wayland-drm/wayland-drm.=
h<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">index 0904245..8bcd5aa=
100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--- a/src/egl/wayland/=
wayland-drm/wayland-drm.h<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">+++ b/src/=
egl/wayland/wayland-drm/wayland-drm.h<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">@@ -8,12 +8,6 @@ s=
truct wl_gbm;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> struct wayland_g=
bm_callbacks {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> &nbs=
p; int (*authen=
ticate)(void *user_data, uint32_t id);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; void *(*reference=
_buffer)(void *user_data, uint32_t name,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; =
&nb=
sp; int32_t width, int32_t=
height,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; =
&nb=
sp; uint32_t stride, uint3=
2_t format);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; void (*release_bu=
ffer)(void *user_data, void *buffer);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">};<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> struct wl_gbm *<=
o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">diff --git a/src/galli=
um/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c b/src/galli=
um/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">index d35cf47..e7f963f=
100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--- a/src/gallium/stat=
e_trackers/egl/common/native_wayland_drm_bufmgr_helper.c<o:p></o:p></span><=
/p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">+++ b/src/=
gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.c<o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">@@ -12,54 +12,6 @@=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> #include "n=
ative_wayland_drm_bufmgr_helper.h"<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-void *<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-egl_g3d_wl_gbm_helper=
_reference_buffer(void *user_data, uint32_t name,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; int32_t width, in=
t32_t height,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; uint32_t stride, =
uint32_t format)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-{<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- struct n=
ative_display *ndpy =3D user_data;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- struct p=
ipe_resource templ;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- struct w=
insys_handle wsh;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- enum pip=
e_format pf;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- switch (=
format) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- case WL_=
GBM_FORMAT_ARGB8888:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; pf =3D PIPE_FORMAT_B8G8R8A8_UNORM;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; break;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- case WL_=
GBM_FORMAT_XRGB8888:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; pf =3D PIPE_FORMAT_B8G8R8X8_UNORM;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; break;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- default:=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; pf =3D PIPE_FORMAT_NONE;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; break;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- }<o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- if (pf =
=3D=3D PIPE_FORMAT_NONE)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; return NULL;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- memset(&=
amp;templ, 0, sizeof(templ));<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- templ.ta=
rget =3D PIPE_TEXTURE_2D;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- templ.fo=
rmat =3D pf;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- templ.bi=
nd =3D PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW;<o:p></o:p></span><=
/p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- templ.wi=
dth0 =3D width;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- templ.he=
ight0 =3D height;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- templ.de=
pth0 =3D 1;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- templ.ar=
ray_size =3D 1;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- memset(&=
amp;wsh, 0, sizeof(wsh));<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- wsh.hand=
le =3D name;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- wsh.stri=
de =3D stride;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- return n=
dpy->screen->resource_from_handle(ndpy->screen, &templ, &w=
sh);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-}<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-void<o:p></o:p></span=
></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-egl_g3d_wl_gbm_helper=
_unreference_buffer(void *user_data, void *buffer)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-{<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- struct p=
ipe_resource *resource =3D buffer;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- pipe_res=
ource_reference(&resource, NULL);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-}<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> struct pipe_reso=
urce *<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">egl_g3d_wl_gbm_common_=
wl_buffer_get_resource(struct native_display *ndpy,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">diff --git a/src/galli=
um/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h b/src/galli=
um/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">index 4d9a41d..57867eb=
100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--- a/src/gallium/stat=
e_trackers/egl/common/native_wayland_drm_bufmgr_helper.h<o:p></o:p></span><=
/p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">+++ b/src/=
gallium/state_trackers/egl/common/native_wayland_drm_bufmgr_helper.h<o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">@@ -27,15 +27,6 @@=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">#define _NATIVE_WAYLAN=
D_GBM_BUFMGR_HELPER_H_<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> #include "w=
ayland-drm.h"<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-void *<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-egl_g3d_wl_gbm_helper=
_reference_buffer(void *user_data, uint32_t name,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; int32_t width, in=
t32_t height,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- &nb=
sp; =
&nb=
sp; uint32_t stride, =
uint32_t format);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-void<o:p></o:p></span=
></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-egl_g3d_wl_gbm_helper=
_unreference_buffer(void *user_data, void *buffer);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">struct pipe_resource *=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">egl_g3d_wl_gbm_common_=
wl_buffer_get_resource(struct native_display *ndpy,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> &nbs=
p; &=
nbsp; &nbs=
p; &=
nbsp; struct wl_buffer *buffer);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">diff --git a/src/galli=
um/state_trackers/egl/drm/native_drm.c b/src/gallium/state_trackers/egl/drm=
/native_drm.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">index 4138b6d..041a37a=
100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--- a/src/gallium/stat=
e_trackers/egl/drm/native_drm.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">+++ b/src/=
gallium/state_trackers/egl/drm/native_drm.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">@@ -199,8 +199,6 @=
@ drm_display_authenticate(void *user_data, uint32_t magic)<o:p></o:p></spa=
n></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> static struct wa=
yland_gbm_callbacks wl_gbm_callbacks =3D {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> drm=
_display_authenticate,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- egl_g3d_=
wl_gbm_helper_reference_buffer,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- egl_g3d_=
wl_gbm_helper_unreference_buffer<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">};<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> static boolean<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">diff --git a/src/galli=
um/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl=
/wayland/native_drm.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">index a96cca8..3d277fe=
100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--- a/src/gallium/stat=
e_trackers/egl/wayland/native_drm.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">+++ b/src/=
gallium/state_trackers/egl/wayland/native_drm.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">@@ -249,8 +249,6 @=
@ wayland_drm_display_authenticate(void *user_data, uint32_t magic)<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> static struct wa=
yland_gbm_callbacks wl_gbm_callbacks =3D {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> way=
land_drm_display_authenticate,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- egl_g3d_=
wl_gbm_helper_reference_buffer,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- egl_g3d_=
wl_gbm_helper_unreference_buffer<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">};<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> static boolean<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">diff --git a/src/galli=
um/state_trackers/egl/x11/native_dri2.c b/src/gallium/state_trackers/egl/x1=
1/native_dri2.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">index 2c38938..bfc06fc=
100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--- a/src/gallium/stat=
e_trackers/egl/x11/native_dri2.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">+++ b/src/=
gallium/state_trackers/egl/x11/native_dri2.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">@@ -849,8 +849,6 @=
@ dri2_display_authenticate(void *user_data, uint32_t magic)<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> static struct wa=
yland_gbm_callbacks wl_gbm_callbacks =3D {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> dri=
2_display_authenticate,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- egl_g3d_=
wl_gbm_helper_reference_buffer,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">- egl_g3d_=
wl_gbm_helper_unreference_buffer<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">};<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> static boolean<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">-- <o:p></o:p></span><=
/p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">1.7.5.4<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p> </o:p></spa=
n></p>
</div>
</body>
</html>
--_000_81DD1C3FC6BE1E4EAA454D486F8200440923DDSHSMSX101ccrcorpi_--
More information about the mesa-dev
mailing list