Skip to content
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

DRM / GBM support for Rpi5 #356

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DRM / GBM support for Rpi5 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if(MSVC)
add_definitions( -DPLATFORM_WINDOWS )
endif()

if (NO_X11 OR FORCE_GBM)
if (NO_X11 OR FORCE_DRM)
add_compile_options(-std=c++14 -DGLM_FORCE_CXX14 -fpermissive -Wno-psabi -lpthread)
endif()

Expand Down
2 changes: 1 addition & 1 deletion deps/lygia
Open in desktop
Submodule lygia updated 230 files
2 changes: 1 addition & 1 deletion deps/vera
Open in desktop
Submodule vera updated 17 files
+1 −1 CMakeLists.txt
+277 −0 cmake/ECMFindModuleHelpers.cmake
+12 −12 cmake/FindBROADCOM.cmake
+2 −2 cmake/FindEGL.cmake
+11 −11 cmake/FindMMAL.cmake
+168 −0 cmake/FindXCB.cmake
+1 −1 deps/CMakeLists.txt
+2 −2 include/vera/gl/gl.h
+5 −4 include/vera/window.h
+60 −49 src/CMakeLists.txt
+8 −4 src/gl/fbo.cpp
+2 −2 src/gl/texture.cpp
+3 −3 src/gl/textureCube.cpp
+1 −1 src/gl/textureStreamMMAL.cpp
+2 −2 src/gl/vbo.cpp
+3 −3 src/ops/draw.cpp
+953 −352 src/window.cpp
8 changes: 4 additions & 4 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ int main(int argc, char **argv) {
else
std::cout << "Argument '" << argument << "' should be followed by a <pixels>. Skipping argument." << std::endl;
}
#if defined(DRIVER_GBM)
#if defined(DRIVER_DRM)
else if ( argument == "-d" || argument == "-display" || argument == "--display") {
if (++i < argc)
window_properties.display = std::string(argv[i]);
Expand All @@ -274,7 +274,7 @@ int main(int argc, char **argv) {
std::cout << version << std::endl;
}
else if ( argument == "-l" || argument == "-life-coding" || argument == "--life-coding" ){
#if defined(DRIVER_BROADCOM) || defined(DRIVER_GBM)
#if defined(DRIVER_BROADCOM) || defined(DRIVER_DRM)
window_properties.screen_x = window_properties.screen_width - 512;
window_properties.screen_width = window_properties.screen_height = 512;
#else
Expand Down Expand Up @@ -390,7 +390,7 @@ int main(int argc, char **argv) {
argument == "-s" || argument == "-size" || argument == "--size" ||
argument == "-w" || argument == "-width" || argument == "--width" ||
argument == "-h" || argument == "-height" || argument == "--height" ||
#if defined(DRIVER_GBM)
#if defined(DRIVER_DRM)
argument == "-d" || argument == "-display" || argument == "--display" ||
#endif
#if !defined(DRIVER_GLFW)
Expand Down Expand Up @@ -1994,7 +1994,7 @@ void printUsage(char * executableName) {
std::cerr << " -s or --size <pixels> # set width and height of the window" << std::endl;
std::cerr << " -w or --width <pixels> # set the width of the window" << std::endl;
std::cerr << " -h or --height <pixels> # set the height of the window" << std::endl;
#if defined(DRIVER_GBM)
#if defined(DRIVER_DRM)
std::cerr << " -d or --display <display> # open specific display port. Ex: -d /dev/dri/card1" << std::endl;
#endif
#if !defined(DRIVER_GLFW)
Expand Down
Loading