rooty/rpi-vk-driver
1
0
Fork 0
mirror of https://github.com/Yours3lf/rpi-vk-driver.git synced 2024-12-01 13:24:20 +01:00
Code Issues Releases Wiki Activity

removed unnecessary wsi functions

Browse Source
This commit is contained in:
yours3lf 2020-05-31 13:39:00 +01:00
parent 8380b583de
commit 2148f5a4cb
3 changed files with 0 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
driver/declarations.h
View File

@ -1039,13 +1039,6 @@ VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkGetDisplayModePropertiesKHR)(
uint32_t* pPropertyCount,
VkDisplayModePropertiesKHR* pProperties);
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkCreateDisplayModeKHR)(
VkPhysicalDevice physicalDevice,
VkDisplayKHR display,
const VkDisplayModeCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
VkDisplayModeKHR* pMode);
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkCreateDisplayPlaneSurfaceKHR)(
VkInstance instance,
const VkDisplaySurfaceCreateInfoKHR* pCreateInfo,
@ -1057,17 +1050,6 @@ VKAPI_ATTR void VKAPI_CALL RPIFUNC(vkDestroySwapchainKHR)(
VkSwapchainKHR swapchain,
const VkAllocationCallbacks* pAllocator);
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkGetDisplayPlaneSupportedDisplaysKHR)(
VkPhysicalDevice physicalDevice,
uint32_t planeIndex,
uint32_t* pDisplayCount,
VkDisplayKHR* pDisplays);
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkGetPhysicalDeviceDisplayPlanePropertiesKHR)(
VkPhysicalDevice physicalDevice,
uint32_t* pPropertyCount,
VkDisplayPlanePropertiesKHR* pProperties);
#ifdef __cplusplus
}
#endif

3
driver/instance.c
View File

@ -499,10 +499,7 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL RPIFUNC(vkGetInstanceProcAddr)(
RETFUNC(vkGetPhysicalDeviceDisplayPropertiesKHR);
RETFUNC(vkGetDisplayModePropertiesKHR);
RETFUNC(vkCreateDisplayModeKHR);
RETFUNC(vkCreateDisplayPlaneSurfaceKHR);
RETFUNC(vkGetDisplayPlaneSupportedDisplaysKHR);
RETFUNC(vkGetPhysicalDeviceDisplayPlanePropertiesKHR);
RETFUNC(vkDestroySwapchainKHR);

109
driver/wsi.c
View File

@ -9,83 +9,6 @@
extern "C" {
#endif
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkGetPhysicalDeviceDisplayPlanePropertiesKHR)(
VkPhysicalDevice physicalDevice,
uint32_t* pPropertyCount,
VkDisplayPlanePropertiesKHR* pProperties)
{
PROFILESTART(RPIFUNC(vkGetPhysicalDeviceDisplayPlanePropertiesKHR));
assert(physicalDevice);
assert(pPropertyCount);
uint32_t numPlanes;
modeset_plane planes[32];
modeset_enum_planes(controlFd, &numPlanes, planes);
if(!pProperties)
{
*pPropertyCount = numPlanes;
PROFILEEND(RPIFUNC(vkGetPhysicalDeviceDisplayPlanePropertiesKHR));
return VK_SUCCESS;
}
int arraySize = *pPropertyCount;
int elementsWritten = min(numPlanes, arraySize);
for(uint32_t c = 0; c < elementsWritten; ++c)
{
pProperties[c].currentDisplay = planes[c].currentConnectorID;
pProperties[c].currentStackIndex = c; //TODO dunno?
}
PROFILEEND(RPIFUNC(vkGetPhysicalDeviceDisplayPlanePropertiesKHR));
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkGetDisplayPlaneSupportedDisplaysKHR)(
VkPhysicalDevice physicalDevice,
uint32_t planeIndex,
uint32_t* pDisplayCount,
VkDisplayKHR* pDisplays)
{
PROFILESTART(RPIFUNC(vkGetDisplayPlaneSupportedDisplaysKHR));
assert(physicalDevice);
assert(pDisplayCount);
uint32_t numPlanes;
modeset_plane planes[32];
modeset_enum_planes(controlFd, &numPlanes, planes);
if(!pDisplays)
{
*pDisplayCount = planes[planeIndex].numPossibleConnectors;
PROFILEEND(RPIFUNC(vkGetDisplayPlaneSupportedDisplaysKHR));
return VK_SUCCESS;
}
int arraySize = *pDisplayCount;
int elementsWritten = min(planes[planeIndex].numPossibleConnectors, arraySize);
for(int c = 0; c < elementsWritten; ++c)
{
pDisplays[c] = planes[planeIndex].possibleConnectors[c];
}
*pDisplayCount = elementsWritten;
if(arraySize < planes[planeIndex].numPossibleConnectors)
{
PROFILEEND(RPIFUNC(vkGetDisplayPlaneSupportedDisplaysKHR));
return VK_INCOMPLETE;
}
PROFILEEND(RPIFUNC(vkGetDisplayPlaneSupportedDisplaysKHR));
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkGetPhysicalDeviceDisplayPropertiesKHR)(
VkPhysicalDevice physicalDevice,
uint32_t* pPropertyCount,
@ -184,38 +107,6 @@ VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkGetDisplayModePropertiesKHR)(
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkCreateDisplayModeKHR)(
VkPhysicalDevice physicalDevice,
VkDisplayKHR display,
const VkDisplayModeCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
VkDisplayModeKHR* pMode)
{
PROFILESTART(RPIFUNC(vkCreateDisplayModeKHR));
assert(physicalDevice);
assert(display);
uint32_t numModes;
modeset_display_mode modes[1024];
modeset_enum_modes_for_display(controlFd, display, &numModes, &modes);
for(uint32_t c = 0; c < numModes; ++c)
{
if(modes[c].refreshRate == pCreateInfo->parameters.refreshRate &&
modes[c].resWidth == pCreateInfo->parameters.visibleRegion.width &&
modes[c].resHeight == pCreateInfo->parameters.visibleRegion.height)
{
_displayMode mode = { modes[c].connectorID, modes[c].modeID };
memcpy(pMode, &mode, sizeof(_displayMode));
break;
}
}
PROFILEEND(RPIFUNC(vkCreateDisplayModeKHR));
}
VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkCreateDisplayPlaneSurfaceKHR)(
VkInstance instance,
const VkDisplaySurfaceCreateInfoKHR* pCreateInfo,