drm

patriciogonzalezvivo · Mar 17, 2024 · 244d2f8 · 244d2f8
1 parent 1698f37
commit 244d2f8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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()
 

diff --git a/deps/lygia b/deps/lygia
diff --git a/deps/vera b/deps/vera
diff --git a/src/main.cpp b/src/main.cpp
@@ -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]);
@@ -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
@@ -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)
@@ -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)
+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