Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
de6e9972
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
de6e9972
编写于
12月 06, 2014
作者:
Z
Zachary Lund
提交者:
jp9000
12月 19, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move from libX11/GLX to XCB/libX11/GLX.
上级
793d7b51
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
643 addition
and
238 deletion
+643
-238
cmake/Modules/FindX11_XCB.cmake
cmake/Modules/FindX11_XCB.cmake
+31
-0
cmake/Modules/FindXCB.cmake
cmake/Modules/FindXCB.cmake
+238
-0
libobs-opengl/CMakeLists.txt
libobs-opengl/CMakeLists.txt
+17
-2
libobs-opengl/gl-x11.c
libobs-opengl/gl-x11.c
+357
-236
未找到文件。
cmake/Modules/FindX11_XCB.cmake
0 → 100644
浏览文件 @
de6e9972
# - Try to find libX11-xcb
# Once done this will define
#
# X11_XCB_FOUND - system has libX11-xcb
# X11_XCB_LIBRARIES - Link these to use libX11-xcb
# X11_XCB_INCLUDE_DIR - the libX11-xcb include dir
# X11_XCB_DEFINITIONS - compiler switches required for using libX11-xcb
# Copyright (c) 2011 Fredrik Höglund <fredrik@kde.org>
# Copyright (c) 2008 Helio Chissini de Castro, <helio@kde.org>
# Copyright (c) 2007 Matthias Kretz, <kretz@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
IF
(
NOT WIN32
)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE
(
PkgConfig
)
PKG_CHECK_MODULES
(
PKG_X11_XCB QUIET x11-xcb
)
SET
(
X11_XCB_DEFINITIONS
${
PKG_X11_XCB_CFLAGS
}
)
FIND_PATH
(
X11_XCB_INCLUDE_DIR NAMES X11/Xlib-xcb.h HINTS
${
PKG_X11_XCB_INCLUDE_DIRS
}
)
FIND_LIBRARY
(
X11_XCB_LIBRARIES NAMES X11-xcb HINTS
${
PKG_X11_XCB_LIBRARY_DIRS
}
)
include
(
FindPackageHandleStandardArgs
)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
X11_XCB DEFAULT_MSG X11_XCB_LIBRARIES X11_XCB_INCLUDE_DIR
)
MARK_AS_ADVANCED
(
X11_XCB_INCLUDE_DIR X11_XCB_LIBRARIES
)
ENDIF
(
NOT WIN32
)
cmake/Modules/FindXCB.cmake
0 → 100644
浏览文件 @
de6e9972
# Try to find XCB on a Unix system
#
# This will define:
#
# XCB_FOUND - True if xcb is available
# XCB_LIBRARIES - Link these to use xcb
# XCB_INCLUDE_DIRS - Include directory for xcb
# XCB_DEFINITIONS - Compiler flags for using xcb
#
# In addition the following more fine grained variables will be defined:
#
# XCB_XCB_FOUND XCB_XCB_INCLUDE_DIR XCB_XCB_LIBRARY
# XCB_UTIL_FOUND XCB_UTIL_INCLUDE_DIR XCB_UTIL_LIBRARY
# XCB_COMPOSITE_FOUND XCB_COMPOSITE_INCLUDE_DIR XCB_COMPOSITE_LIBRARY
# XCB_DAMAGE_FOUND XCB_DAMAGE_INCLUDE_DIR XCB_DAMAGE_LIBRARY
# XCB_XFIXES_FOUND XCB_XFIXES_INCLUDE_DIR XCB_XFIXES_LIBRARY
# XCB_RENDER_FOUND XCB_RENDER_INCLUDE_DIR XCB_RENDER_LIBRARY
# XCB_RANDR_FOUND XCB_RANDR_INCLUDE_DIR XCB_RANDR_LIBRARY
# XCB_SHAPE_FOUND XCB_SHAPE_INCLUDE_DIR XCB_SHAPE_LIBRARY
# XCB_DRI2_FOUND XCB_DRI2_INCLUDE_DIR XCB_DRI2_LIBRARY
# XCB_GLX_FOUND XCB_GLX_INCLUDE_DIR XCB_GLX_LIBRARY
# XCB_SHM_FOUND XCB_SHM_INCLUDE_DIR XCB_SHM_LIBRARY
# XCB_XV_FOUND XCB_XV_INCLUDE_DIR XCB_XV_LIBRARY
# XCB_SYNC_FOUND XCB_SYNC_INCLUDE_DIR XCB_SYNC_LIBRARY
# XCB_XTEST_FOUND XCB_XTEST_INCLUDE_DIR XCB_XTEST_LIBRARY
# XCB_ICCCM_FOUND XCB_ICCCM_INCLUDE_DIR XCB_ICCCM_LIBRARY
# XCB_EWMH_FOUND XCB_EWMH_INCLUDE_DIR XCB_EWMH_LIBRARY
# XCB_IMAGE_FOUND XCB_IMAGE_INCLUDE_DIR XCB_IMAGE_LIBRARY
# XCB_RENDERUTIL_FOUND XCB_RENDERUTIL_INCLUDE_DIR XCB_RENDERUTIL_LIBRARY
# XCB_KEYSYMS_FOUND XCB_KEYSYMS_INCLUDE_DIR XCB_KEYSYMS_LIBRARY
#
# Copyright (c) 2011 Fredrik Höglund <fredrik@kde.org>
# Copyright (c) 2013 Martin Gräßlin <mgraesslin@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
set
(
knownComponents XCB
COMPOSITE
DAMAGE
DRI2
EWMH
GLX
ICCCM
IMAGE
KEYSYMS
RANDR
RENDER
RENDERUTIL
SHAPE
SHM
SYNC
UTIL
XFIXES
XTEST
XV
)
unset
(
unknownComponents
)
set
(
pkgConfigModules
)
set
(
requiredComponents
)
if
(
XCB_FIND_COMPONENTS
)
set
(
comps
${
XCB_FIND_COMPONENTS
}
)
else
()
set
(
comps
${
knownComponents
}
)
endif
()
# iterate through the list of requested components, and check that we know them all.
# If not, fail.
foreach
(
comp
${
comps
}
)
list
(
FIND knownComponents
${
comp
}
index
)
if
(
"
${
index
}
"
STREQUAL
"-1"
)
list
(
APPEND unknownComponents
"
${
comp
}
"
)
else
()
if
(
"
${
comp
}
"
STREQUAL
"XCB"
)
list
(
APPEND pkgConfigModules
"xcb"
)
elseif
(
"
${
comp
}
"
STREQUAL
"COMPOSITE"
)
list
(
APPEND pkgConfigModules
"xcb-composite"
)
elseif
(
"
${
comp
}
"
STREQUAL
"DAMAGE"
)
list
(
APPEND pkgConfigModules
"xcb-damage"
)
elseif
(
"
${
comp
}
"
STREQUAL
"DRI2"
)
list
(
APPEND pkgConfigModules
"xcb-dri2"
)
elseif
(
"
${
comp
}
"
STREQUAL
"EWMH"
)
list
(
APPEND pkgConfigModules
"xcb-ewmh"
)
elseif
(
"
${
comp
}
"
STREQUAL
"GLX"
)
list
(
APPEND pkgConfigModules
"xcb-glx"
)
elseif
(
"
${
comp
}
"
STREQUAL
"ICCCM"
)
list
(
APPEND pkgConfigModules
"xcb-icccm"
)
elseif
(
"
${
comp
}
"
STREQUAL
"IMAGE"
)
list
(
APPEND pkgConfigModules
"xcb-image"
)
elseif
(
"
${
comp
}
"
STREQUAL
"KEYSYMS"
)
list
(
APPEND pkgConfigModules
"xcb-keysyms"
)
elseif
(
"
${
comp
}
"
STREQUAL
"RANDR"
)
list
(
APPEND pkgConfigModules
"xcb-randr"
)
elseif
(
"
${
comp
}
"
STREQUAL
"RENDER"
)
list
(
APPEND pkgConfigModules
"xcb-render"
)
elseif
(
"
${
comp
}
"
STREQUAL
"RENDERUTIL"
)
list
(
APPEND pkgConfigModules
"xcb-renderutil"
)
elseif
(
"
${
comp
}
"
STREQUAL
"SHAPE"
)
list
(
APPEND pkgConfigModules
"xcb-shape"
)
elseif
(
"
${
comp
}
"
STREQUAL
"SHM"
)
list
(
APPEND pkgConfigModules
"xcb-shm"
)
elseif
(
"
${
comp
}
"
STREQUAL
"SYNC"
)
list
(
APPEND pkgConfigModules
"xcb-sync"
)
elseif
(
"
${
comp
}
"
STREQUAL
"UTIL"
)
list
(
APPEND pkgConfigModules
"xcb-util"
)
elseif
(
"
${
comp
}
"
STREQUAL
"XFIXES"
)
list
(
APPEND pkgConfigModules
"xcb-xfixes"
)
elseif
(
"
${
comp
}
"
STREQUAL
"XTEST"
)
list
(
APPEND pkgConfigModules
"xcb-xtest"
)
elseif
(
"
${
comp
}
"
STREQUAL
"XV"
)
list
(
APPEND pkgConfigModules
"xcb-xv"
)
endif
()
endif
()
endforeach
()
if
(
DEFINED unknownComponents
)
set
(
msgType STATUS
)
if
(
XCB_FIND_REQUIRED
)
set
(
msgType FATAL_ERROR
)
endif
()
if
(
NOT XCB_FIND_QUIETLY
)
message
(
${
msgType
}
"XCB: requested unknown components
${
unknownComponents
}
"
)
endif
()
return
()
endif
()
macro
(
_XCB_HANDLE_COMPONENT _comp
)
set
(
_header
)
set
(
_lib
)
if
(
"
${
_comp
}
"
STREQUAL
"XCB"
)
set
(
_header
"xcb/xcb.h"
)
set
(
_lib
"xcb"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"COMPOSITE"
)
set
(
_header
"xcb/composite.h"
)
set
(
_lib
"xcb-composite"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"DAMAGE"
)
set
(
_header
"xcb/damage.h"
)
set
(
_lib
"xcb-damage"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"DRI2"
)
set
(
_header
"xcb/dri2.h"
)
set
(
_lib
"xcb-dri2"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"EWMH"
)
set
(
_header
"xcb/xcb_ewmh.h"
)
set
(
_lib
"xcb-ewmh"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"GLX"
)
set
(
_header
"xcb/glx.h"
)
set
(
_lib
"xcb-glx"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"ICCCM"
)
set
(
_header
"xcb/xcb_icccm.h"
)
set
(
_lib
"xcb-icccm"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"IMAGE"
)
set
(
_header
"xcb/xcb_image.h"
)
set
(
_lib
"xcb-image"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"KEYSYMS"
)
set
(
_header
"xcb/xcb_keysyms.h"
)
set
(
_lib
"xcb-keysyms"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"RANDR"
)
set
(
_header
"xcb/randr.h"
)
set
(
_lib
"xcb-randr"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"RENDER"
)
set
(
_header
"xcb/render.h"
)
set
(
_lib
"xcb-render"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"RENDERUTIL"
)
set
(
_header
"xcb/xcb_renderutil.h"
)
set
(
_lib
"xcb-render-util"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"SHAPE"
)
set
(
_header
"xcb/shape.h"
)
set
(
_lib
"xcb-shape"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"SHM"
)
set
(
_header
"xcb/shm.h"
)
set
(
_lib
"xcb-shm"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"SYNC"
)
set
(
_header
"xcb/sync.h"
)
set
(
_lib
"xcb-sync"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"UTIL"
)
set
(
_header
"xcb/xcb_util.h"
)
set
(
_lib
"xcb-util"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"XFIXES"
)
set
(
_header
"xcb/xfixes.h"
)
set
(
_lib
"xcb-xfixes"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"XTEST"
)
set
(
_header
"xcb/xtest.h"
)
set
(
_lib
"xcb-xtest"
)
elseif
(
"
${
_comp
}
"
STREQUAL
"XV"
)
set
(
_header
"xcb/xv.h"
)
set
(
_lib
"xcb-xv"
)
endif
()
find_path
(
XCB_
${
_comp
}
_INCLUDE_DIR NAMES
${
_header
}
HINTS
${
PKG_XCB_INCLUDE_DIRS
}
)
find_library
(
XCB_
${
_comp
}
_LIBRARY NAMES
${
_lib
}
HINTS
${
PKG_XCB_LIBRARY_DIRS
}
)
if
(
XCB_
${
_comp
}
_INCLUDE_DIR AND XCB_
${
_comp
}
_LIBRARY
)
list
(
APPEND XCB_INCLUDE_DIRS
${
XCB_
${
_comp
}
_INCLUDE_DIR
}
)
list
(
APPEND XCB_LIBRARIES
${
XCB_
${
_comp
}
_LIBRARY
}
)
if
(
NOT XCB_FIND_QUIETLY
)
message
(
STATUS
"XCB[
${
_comp
}
]: Found component
${
_comp
}
"
)
endif
()
endif
()
if
(
XCB_FIND_REQUIRED_
${
_comp
}
)
list
(
APPEND requiredComponents XCB_
${
_comp
}
_FOUND
)
endif
()
find_package_handle_standard_args
(
XCB_
${
_comp
}
DEFAULT_MSG XCB_
${
_comp
}
_LIBRARY XCB_
${
_comp
}
_INCLUDE_DIR
)
mark_as_advanced
(
XCB_
${
_comp
}
_LIBRARY XCB_
${
_comp
}
_INCLUDE_DIR
)
# compatibility for old variable naming
set
(
XCB_
${
_comp
}
_INCLUDE_DIRS
${
XCB_
${
_comp
}
_INCLUDE_DIR
}
)
set
(
XCB_
${
_comp
}
_LIBRARIES
${
XCB_
${
_comp
}
_LIBRARY
}
)
endmacro
()
IF
(
NOT WIN32
)
include
(
FindPackageHandleStandardArgs
)
# Use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package
(
PkgConfig
)
pkg_check_modules
(
PKG_XCB QUIET
${
pkgConfigModules
}
)
set
(
XCB_DEFINITIONS
${
PKG_XCB_CFLAGS
}
)
foreach
(
comp
${
comps
}
)
_xcb_handle_component
(
${
comp
}
)
endforeach
()
if
(
XCB_INCLUDE_DIRS
)
list
(
REMOVE_DUPLICATES XCB_INCLUDE_DIRS
)
endif
()
find_package_handle_standard_args
(
XCB DEFAULT_MSG XCB_LIBRARIES XCB_INCLUDE_DIRS
${
requiredComponents
}
)
# compatibility for old variable naming
set
(
XCB_INCLUDE_DIR
${
XCB_INCLUDE_DIRS
}
)
ENDIF
(
NOT WIN32
)
libobs-opengl/CMakeLists.txt
浏览文件 @
de6e9972
...
...
@@ -17,7 +17,7 @@ elseif(APPLE)
set_source_files_properties
(
${
libobs-opengl_PLATFORM_SOURCES
}
PROPERTIES
LANGUAGE C
)
find_library
(
COCOA Cocoa
)
include_directories
(
${
COCOA
}
)
mark_as_advanced
(
COCOA
)
...
...
@@ -30,7 +30,22 @@ elseif(APPLE)
${
COCOA
}
${
IOSURF
}
${
OPENGL_gl_LIBRARY
}
)
else
()
else
()
#This needs to change to be more specific to get ready for Wayland
find_package
(
XCB COMPONENTS XCB REQUIRED
)
find_package
(
X11_XCB REQUIRED
)
include_directories
(
${
XCB_INCLUDE_DIRS
}
${
X11_XCB_INCLUDE_DIRS
}
)
add_definitions
(
${
XCB_DEFINITIONS
}
${
X11_XCB_DEFINITIONS
}
)
set
(
libobs-opengl_PLATFORM_DEPS
${
XCB_LIBRARIES
}
${
X11_XCB_LIBRARIES
}
)
set
(
libobs-opengl_PLATFORM_SOURCES
gl-x11.c
)
endif
()
...
...
libobs-opengl/gl-x11.c
浏览文件 @
de6e9972
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录