geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Video/KMSDRM] Comment out some debug info, adjust comments for future work.

main
Manuel Alfayate Corchete 2020-12-19 02:08:59 +01:00
parent 6b81cac420
commit 436499f3ec
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@ -682,7 +682,9 @@ int drm_atomic_commit(_THIS, SDL_bool blocking)
if (ret) { if (ret) {
SDL_SetError("Atomic commit failed, returned %d.", ret); SDL_SetError("Atomic commit failed, returned %d.", ret);
/* Uncomment this for fast-debugging */ /* Uncomment this for fast-debugging */
#if 0
printf("ATOMIC COMMIT FAILED: %s.\n", strerror(errno)); printf("ATOMIC COMMIT FAILED: %s.\n", strerror(errno));
#endif
goto out; goto out;
} }

16
src/video/kmsdrm/SDL_kmsdrmvulkan.c
View File

@ -275,11 +275,15 @@ SDL_bool KMSDRM_Vulkan_CreateSurface(_THIS,
physical_devices = malloc(sizeof(VkPhysicalDevice) * gpu_count); physical_devices = malloc(sizeof(VkPhysicalDevice) * gpu_count);
vkEnumeratePhysicalDevices(instance, &gpu_count, physical_devices); vkEnumeratePhysicalDevices(instance, &gpu_count, physical_devices);
/* For now, just grab the first physical device (gpu = physical_device in vkcube example).*/ /* A GPU (or physical_device, in vkcube terms) is a GPU. A machine with more
/* TODO What happens on video systems with multiple display ports like the Rpi4 ? */ than one video output doen't need to have more than one GPU, like the Pi4
which has 1 GPU and 2 video outputs.
For now, just grab the first GPU/physical_device.
TODO Manage multiple GPUs? Maybe just use the first one supporting Vulkan? */
gpu = physical_devices[0]; gpu = physical_devices[0];
/* Get the display count of the phsysical device. */ /* A display is a video output. 1 GPU can have N displays.
Get the display count of the GPU. */
vkGetPhysicalDeviceDisplayPropertiesKHR(gpu, &display_count, NULL); vkGetPhysicalDeviceDisplayPropertiesKHR(gpu, &display_count, NULL);
if (display_count == 0) { if (display_count == 0) {
SDL_SetError("Vulkan can't find any displays."); SDL_SetError("Vulkan can't find any displays.");
@ -293,7 +297,6 @@ SDL_bool KMSDRM_Vulkan_CreateSurface(_THIS,
displays_props); displays_props);
/* Get the videomode count for the first display. */ /* Get the videomode count for the first display. */
/* TODO What happens on video systems with multiple display ports like the Rpi4 ? */
vkGetDisplayModePropertiesKHR(gpu, vkGetDisplayModePropertiesKHR(gpu,
displays_props[0].display, displays_props[0].display,
&mode_count, NULL); &mode_count, NULL);
@ -311,7 +314,6 @@ SDL_bool KMSDRM_Vulkan_CreateSurface(_THIS,
&mode_count, modes_props); &mode_count, modes_props);
/* Get the planes count of the physical device. */ /* Get the planes count of the physical device. */
/* TODO: find out if we need other planes. */
vkGetPhysicalDeviceDisplayPlanePropertiesKHR(gpu, &plane_count, NULL); vkGetPhysicalDeviceDisplayPlanePropertiesKHR(gpu, &plane_count, NULL);
if (plane_count == 0) { if (plane_count == 0) {
SDL_SetError("Vulkan can't find any planes."); SDL_SetError("Vulkan can't find any planes.");
@ -322,8 +324,8 @@ SDL_bool KMSDRM_Vulkan_CreateSurface(_THIS,
planes_props = malloc(sizeof(VkDisplayPlanePropertiesKHR) * plane_count); planes_props = malloc(sizeof(VkDisplayPlanePropertiesKHR) * plane_count);
vkGetPhysicalDeviceDisplayPlanePropertiesKHR(gpu, &plane_count, planes_props); vkGetPhysicalDeviceDisplayPlanePropertiesKHR(gpu, &plane_count, planes_props);
/* Get a video mode matching the window size. /* Get a video mode equal or smaller than the window size. REMEMBER:
REMEMBER: We have to get a small enough videomode for the window size, We have to get a small enough videomode for the window size,
because videomode determines how big the scanout region is and we can't because videomode determines how big the scanout region is and we can't
scanout a region bigger than the window (we would be reading past the scanout a region bigger than the window (we would be reading past the
buffer, and Vulkan would give us a confusing VK_ERROR_SURFACE_LOST_KHR). */ buffer, and Vulkan would give us a confusing VK_ERROR_SURFACE_LOST_KHR). */