forked from 12to11/12to11
b4ee06589e
EGL support is still incomplete; stuff like scaling is missing. * 12to11.c (PickVisual, XLMain): Remove function. Initialize renderers, and rely on that to initialize the visuals. * 12to11.man: Document new environment variables. * Imakefile (SRCS, OBJS): Add picture_renderer.c and renderer.c and their associated objects. (GENHEADERS): New variable for generated headers. (EGL_SRCS, EGL_OBJS): New variables. (LOCAL_LIBRARIES, SRCS, OBJS, DEFINES): [HaveEglSupport]: Add EGL defines, libraries, and objects.:(shaders.h): New rule. (depend, cleandir): Depend on generated headers and SRCs. $($(OBJS)): Depend on $(GENHEADERS). * README: Write how to build with EGL support and update content descriptions. * buffer.c (XLPictureFromBuffer): Delete function. (XLRenderBufferFromBuffer): New function. (XLPixmapFromBuffer): Delete function. * compositor.h (enum _Operation, struct _SharedMemoryAttributes) (struct _DmaBufAttributes, union _RenderTarget) (union _RenderBuffer, struct _RenderFuncs, struct _DrmFormat) (struct _ShmFormat, struct _BufferFuncs, struct _ExtBufferFuncs): New structures. (Fallthrough): New define. Define to __attribute__ ((fallthrough)) wherever supported. Replace uses of Picture with RenderBuffer. * dmabuf.c (struct _DrmFormatInfo): Remove structures. (struct _BufferParams): Remove link. (struct _Buffer): Replace pixmap and picture with render buffer object. (dri3_opcode, all_formats, pending_success, next_roundtrip_id) (round_trip_window): Delete. (ReleaseBufferParams, HandleParamsResourceDestroy, ForceRoundTrip) (DepthForFormat, XLHandleErrorForDmabuf, PictFormatForFormat) (DestroyBacking, GetPictureFunc, GetPixmapFunc, GetBufferFunc) (CreateBufferFor, ModifierHigh, FinishBufferCreation) (XLHandleOneXEventForDmabuf, CreateHeader, Create, CreateImmed) (FindFormatMatching, FindSupportedModifiers, FindSupportedFormats) (SendSupportedFormats, HandleBind, InitDrmDevice, WriteFormatTable) (ReallyInitDmabuf, ReadSupportedFormats, XLInitDmabuf): Remove various functions and reimplement as a wrapper around the renderer abstraction, instead of DRI3. * fns.c (struct _Busfault): New structure. (busfault_tree, bus_handler_installed): New variables. (GetHeight, FixHeights, RotateLeft, RotateRight, RebalanceBusfault) (RecordBusfault, DetectBusfault, DeleteMin, RemoveBusfault) (HandleBusfault, MaybeInstallBusHandler, BlockSigbus) (UnblockSigbus, XLRecordBusfault, XLRemoveBusfaults): New functions to store non-overlapping regions of mapped memory in an AVL tree, and to ignore SIGBUS events that trap within. * icon_surface.c (struct _IconSurface): Replace picture with rendering target. (ReleaseBacking, XLGetIconSurface): Use rendering targets instead of pictures. * libraries.def: Add defines for EGL. * run.c (HandleOneXEvent): Replace old dmabuf code with renderer code. * seat.c (CursorFromRole, PictureForCursor, ApplyCursor) (UpdateCursorFromSubcompositor, Subframe, EndSubframe): Rewrite cursor code to use rendering targets and not pictures. * shm.c (Buffer, DereferencePool): Remove SIGBUS protection. (DereferenceBuffer): Reimplement in terms of renderer functions. (GetPictureFunc): Delete function. (GetBufferFunc): New function. (GetPixmapFunc): Delete function. (PrintBuffer): Remove now-broken implementation. (DepthForFormat, PictFormatForFormat): Delete functions, as they are now part of the rendering backend. (IsFormatSupported): New function. (CreateBuffer): Reimplement in terms of renderer functions. (ResizePool): Change SIGBUS protection for resize. (CreatePool): Protect buffer data from SIGBUS should a client truncate the file. (PostFormats): Reimplement in terms of RenderGetShmFormats. (XLInitShm): Stop initializing MIT-SHM. * subcompositor.c (IsTargetAttached): New flag and associated macros. (struct _View): Remove useless field. (struct _Subcompositor): Change target to RenderTarget. Add fields for prior damage. (MakeSubcompositor): Initialize new fields. (SubcompositorSetTarget): Accept RenderTarget, not picture, and set target attached flag. (ViewGetTransform): Delete function. (ViewApplyTransform): New function. (FillBoxesWithTransparency): Reimplement in terms of renderer functions. (StorePreviousDamage): New function. (SubcompositorUpdate): Reimplement in terms of renderer functions. Also, learn to deal with situations where the buffer reflects the state 1 to 2 swaps ago. (SubcompositorExpose): Reimplement in terms of renderer functions. (SubcompositorFree): Free new fields. (SubcompositorInit): Remove no longer required initialization of identity matrix. * xdata.c (ReceiveBody): Fix coding style. * xdg_surface.c (struct _XdgRole, ReleaseBacking, XLGetXdgSurface): Switch from pictures to RenderTargets. * xerror.c (ErrorHandler): Handle errors for picture renderer instead of dmabuf.c.
120 lines
2.5 KiB
C
120 lines
2.5 KiB
C
/* Wayland compositor running on top of an X server.
|
|
|
|
Copyright (C) 2022 to various contributors.
|
|
|
|
This file is part of 12to11.
|
|
|
|
12to11 is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation, either version 3 of the License, or (at your
|
|
option) any later version.
|
|
|
|
12to11 is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with 12to11. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
#include "compositor.h"
|
|
|
|
typedef struct _DestroyListener DestroyListener;
|
|
|
|
struct _DestroyListener
|
|
{
|
|
/* Function to call. */
|
|
ExtBufferFunc func;
|
|
|
|
/* User data. */
|
|
void *data;
|
|
};
|
|
|
|
void
|
|
XLRetainBuffer (ExtBuffer *buffer)
|
|
{
|
|
buffer->funcs.retain (buffer);
|
|
}
|
|
|
|
void
|
|
XLDereferenceBuffer (ExtBuffer *buffer)
|
|
{
|
|
buffer->funcs.dereference (buffer);
|
|
}
|
|
|
|
RenderBuffer
|
|
XLRenderBufferFromBuffer (ExtBuffer *buffer)
|
|
{
|
|
return buffer->funcs.get_buffer (buffer);
|
|
}
|
|
|
|
unsigned int
|
|
XLBufferWidth (ExtBuffer *buffer)
|
|
{
|
|
return buffer->funcs.width (buffer);
|
|
}
|
|
|
|
unsigned int
|
|
XLBufferHeight (ExtBuffer *buffer)
|
|
{
|
|
return buffer->funcs.height (buffer);
|
|
}
|
|
|
|
void
|
|
XLReleaseBuffer (ExtBuffer *buffer)
|
|
{
|
|
buffer->funcs.release (buffer);
|
|
}
|
|
|
|
void *
|
|
XLBufferRunOnFree (ExtBuffer *buffer, ExtBufferFunc func,
|
|
void *data)
|
|
{
|
|
DestroyListener *listener;
|
|
|
|
listener = XLMalloc (sizeof *listener);
|
|
|
|
listener->func = func;
|
|
listener->data = data;
|
|
|
|
buffer->destroy_listeners
|
|
= XLListPrepend (buffer->destroy_listeners,
|
|
listener);
|
|
|
|
return listener;
|
|
}
|
|
|
|
void
|
|
XLBufferCancelRunOnFree (ExtBuffer *buffer, void *key)
|
|
{
|
|
buffer->destroy_listeners
|
|
= XLListRemove (buffer->destroy_listeners, key);
|
|
XLFree (key);
|
|
}
|
|
|
|
void
|
|
XLPrintBuffer (ExtBuffer *buffer)
|
|
{
|
|
if (buffer->funcs.print_buffer)
|
|
buffer->funcs.print_buffer (buffer);
|
|
}
|
|
|
|
void
|
|
ExtBufferDestroy (ExtBuffer *buffer)
|
|
{
|
|
XLList *listener;
|
|
DestroyListener *item;
|
|
|
|
/* Now run every destroy listener connected to this buffer. */
|
|
for (listener = buffer->destroy_listeners;
|
|
listener; listener = listener->next)
|
|
{
|
|
item = listener->data;
|
|
|
|
item->func (buffer, item->data);
|
|
}
|
|
|
|
/* Not very efficient, since the list is followed through twice, but
|
|
destroy listener lists should always be small. */
|
|
XLListFree (buffer->destroy_listeners, XLFree);
|
|
}
|