这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix xshmfence #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Fix xshmfence #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68d250f
fix(libxshmfence): Disable futex because it won't work
xMeM Dec 9, 2024
3f04acb
fix(dri3.c): Allowed using the DRM_FORMAT_MOD_INVALID modifier
xMeM Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/cpp/lorie/InitOutput.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ from The Open Group.
#include "cursorstr.h"
#include "propertyst.h"
#include "shmint.h"
#include "misyncshm.h"
#include "glxserver.h"
#include "glxutil.h"
#include "fbconfigs.h"
Expand Down Expand Up @@ -591,6 +592,7 @@ lorieScreenInit(ScreenPtr pScreen, unused int argc, unused char **argv) {

QueueWorkProc(resetRootCursor, NULL, NULL);
ShmRegisterFbFuncs(pScreen);
miSyncShmScreenInit(pScreen);

return TRUE;
} /* end lorieScreenInit */
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/cpp/lorie/dri3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <android/hardware_buffer.h>
#include <sys/stat.h>
#include <errno.h>
#include "drm_fourcc.h"
#include "screenint.h"
#include "lorie.h"
#include "renderer.h"
Expand Down Expand Up @@ -441,12 +442,13 @@ static PixmapPtr loriePixmapFromFds(ScreenPtr screen, CARD8 num_fds, const int *
return NULL;
}

if (modifier != RAW_MMAPPABLE_FD && modifier != AHARDWAREBUFFER_SOCKET_FD) {
if (modifier != RAW_MMAPPABLE_FD && modifier != AHARDWAREBUFFER_SOCKET_FD &&
modifier != DRM_FORMAT_MOD_INVALID) {
log(ERROR, "DRI3: Modifier is not RAW_MMAPPABLE_FD or AHARDWAREBUFFER_SOCKET_FD");
return NULL;
}

if (modifier == RAW_MMAPPABLE_FD) {
if (modifier == DRM_FORMAT_MOD_INVALID || modifier == RAW_MMAPPABLE_FD) {
void *addr = mmap(NULL, strides[0] * height, PROT_READ, MAP_SHARED, fds[0], offsets[0]);
if (!addr || addr == MAP_FAILED) {
log(ERROR, "DRI3: RAW_MMAPPABLE_FD: mmap failed");
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/cpp/recipes/xshmfence.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/values.h" CONTENT "#include <limits.h>")
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/libxshmfence/src/xshmfence.h" "${CMAKE_CURRENT_BINARY_DIR}/X11/xshmfence.h")
add_library(xshmfence STATIC "libxshmfence/src/xshmfence_alloc.c" "libxshmfence/src/xshmfence_futex.c")
add_library(xshmfence STATIC "libxshmfence/src/xshmfence_alloc.c" "libxshmfence/src/xshmfence_pthread.c")
target_include_directories(xshmfence PRIVATE "xorgproto/include" "${CMAKE_CURRENT_BINARY_DIR}")
target_compile_options(xshmfence PRIVATE "-DSHMDIR=\"/\"" "-DHAVE_FUTEX" "-DMAXINT=INT_MAX")
target_compile_options(xshmfence PRIVATE "-DSHMDIR=\"/\"" "-DHAVE_PTHREAD" "-DMAXINT=INT_MAX")