fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/egl: Fix build errors in ximage backend after merge.

Browse source 
This fixes assorted merge conflicts when master is merged to
gallium-sw-api-2 in 0c96690a5b.
This commit is contained in:
Chia-I Wu 2010-03-10 09:48:33 +08:00
parent 02716cf7d1
commit 1f92cf55e1
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/state_trackers/egl/x11/native_x11.c
View file

@ -144,7 +144,7 @@ native_create_display(EGLNativeDisplayType dpy,
EGLint level = (force_sw) ? _EGL_INFO : _EGL_WARNING;
_eglLog(level, "use software fallback");
ndpy = x11_create_ximage_display(dpy);
ndpy = x11_create_ximage_display(dpy, event_handler);
}
return ndpy;

3
src/gallium/state_trackers/egl/x11/native_x11.h
View file

@ -29,7 +29,8 @@
#include "common/native.h"
struct native_display *
x11_create_ximage_display(EGLNativeDisplayType dpy);
x11_create_ximage_display(EGLNativeDisplayType dpy,
struct native_event_handler *event_handler);
struct native_display *
x11_create_dri2_display(EGLNativeDisplayType dpy,

11
src/gallium/state_trackers/egl/x11/native_ximage.c
View file

@ -51,11 +51,11 @@ struct ximage_display {
Display *dpy;
boolean own_dpy;
struct native_event_handler *event_handler;
struct x11_screen *xscr;
int xscr_number;
struct xm_driver *driver;
struct ximage_config *configs;
int num_configs;
};
@ -138,7 +138,7 @@ ximage_surface_alloc_buffer(struct native_surface *nsurf,
switch (which) {
case NATIVE_ATTACHMENT_FRONT_LEFT:
case NATIVE_ATTACHMENT_FRONT_RIGHT:
templ.tex_usage |= PIPE_TEXTURE_USAGE_PRIMARY;
templ.tex_usage |= PIPE_TEXTURE_USAGE_SCANOUT;
break;
case NATIVE_ATTACHMENT_BACK_LEFT:
case NATIVE_ATTACHMENT_BACK_RIGHT:
@ -615,7 +615,8 @@ ximage_display_destroy(struct native_display *ndpy)
}
struct native_display *
x11_create_ximage_display(EGLNativeDisplayType dpy)
x11_create_ximage_display(EGLNativeDisplayType dpy,
struct native_event_handler *event_handler)
{
struct ximage_display *xdpy;
@ -633,6 +634,8 @@ x11_create_ximage_display(EGLNativeDisplayType dpy)
xdpy->own_dpy = TRUE;
}
xdpy->event_handler = event_handler;
xdpy->xscr_number = DefaultScreen(xdpy->dpy);
xdpy->xscr = x11_screen_create(xdpy->dpy, xdpy->xscr_number);
if (!xdpy->xscr) {