removed a ton of errors
This commit is contained in:
@@ -2,7 +2,6 @@
|
|||||||
#include <instance/vulkan_instance.h>
|
#include <instance/vulkan_instance.h>
|
||||||
#include "vulkan_surface.h"
|
#include "vulkan_surface.h"
|
||||||
#include <output_device/vulkan_physical_device.h>
|
#include <output_device/vulkan_physical_device.h>
|
||||||
#include "vulkan_result_converter.h"
|
|
||||||
|
|
||||||
#ifdef GN_PLATFORM_LINUX
|
#ifdef GN_PLATFORM_LINUX
|
||||||
#ifdef GN_WINDOW_X11
|
#ifdef GN_WINDOW_X11
|
||||||
@@ -57,16 +56,17 @@ void destroyWindowSurface(struct gnWindowSurface_t* windowSurface) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
gnSurfaceFormat* vkGetSurfaceFormats(
|
gnSurfaceFormat* vkGetSurfaceFormats(
|
||||||
struct gnWindowSurface_t* windowSurface, gnPhysicalDevice device, uint32_t* formatCount
|
struct gnWindowSurface_t* windowSurface, gnPhysicalDevice deviceHandle, uint32_t* formatCount
|
||||||
) {
|
) {
|
||||||
gnSurfaceFormat* formats = NULL;
|
gnSurfaceFormat* formats = NULL;
|
||||||
|
VkPhysicalDevice device = (VkPhysicalDevice)deviceHandle;
|
||||||
|
|
||||||
vkGetPhysicalDeviceSurfaceFormatsKHR(device->physicalDevice->device, windowSurface->windowSurface->surface, formatCount, NULL);
|
vkGetPhysicalDeviceSurfaceFormatsKHR(device, windowSurface->windowSurface->surface, formatCount, NULL);
|
||||||
formats = malloc(sizeof(gnSurfaceFormat) * *formatCount);
|
formats = malloc(sizeof(gnSurfaceFormat) * *formatCount);
|
||||||
VkSurfaceFormatKHR* vkFormats = malloc(sizeof(VkSurfaceFormatKHR) * *formatCount);;
|
VkSurfaceFormatKHR* vkFormats = malloc(sizeof(VkSurfaceFormatKHR) * *formatCount);;
|
||||||
|
|
||||||
if (*formatCount > 0) {
|
if (*formatCount > 0) {
|
||||||
vkGetPhysicalDeviceSurfaceFormatsKHR(device->physicalDevice->device, windowSurface->windowSurface->surface, formatCount, vkFormats);
|
vkGetPhysicalDeviceSurfaceFormatsKHR(device, windowSurface->windowSurface->surface, formatCount, vkFormats);
|
||||||
for (uint32_t i = 0; i < *formatCount; i++) {
|
for (uint32_t i = 0; i < *formatCount; i++) {
|
||||||
switch (vkFormats[i].format) {
|
switch (vkFormats[i].format) {
|
||||||
case VK_FORMAT_B8G8R8A8_SRGB: { formats[i].format = GN_FORMAT_BGRA8_SRGB; break; }
|
case VK_FORMAT_B8G8R8A8_SRGB: { formats[i].format = GN_FORMAT_BGRA8_SRGB; break; }
|
||||||
@@ -85,13 +85,13 @@ gnSurfaceFormat* vkGetSurfaceFormats(
|
|||||||
}
|
}
|
||||||
|
|
||||||
gnSurfaceDetails getSurfaceDetails(
|
gnSurfaceDetails getSurfaceDetails(
|
||||||
gnWindowSurfaceHandle windowSurface, gnPhysicalDevice device
|
gnWindowSurfaceHandle windowSurface, gnPhysicalDevice deviceHandle
|
||||||
) {
|
) {
|
||||||
gnSurfaceDetails surfaceDetails;
|
gnSurfaceDetails surfaceDetails;
|
||||||
surfaceDetails.formats = vkGetSurfaceFormats(windowSurface, device, &surfaceDetails.formatCount);
|
surfaceDetails.formats = vkGetSurfaceFormats(windowSurface, deviceHandle, &surfaceDetails.formatCount);
|
||||||
|
|
||||||
VkSurfaceCapabilitiesKHR details;
|
VkSurfaceCapabilitiesKHR details;
|
||||||
vkGetPhysicalDeviceSurfaceCapabilitiesKHR(device->physicalDevice->device, windowSurface->windowSurface->surface, &details);
|
vkGetPhysicalDeviceSurfaceCapabilitiesKHR((VkPhysicalDevice)deviceHandle, windowSurface->windowSurface->surface, &details);
|
||||||
|
|
||||||
surfaceDetails.minImageCount = details.minImageCount;
|
surfaceDetails.minImageCount = details.minImageCount;
|
||||||
surfaceDetails.maxImageCount = details.maxImageCount;
|
surfaceDetails.maxImageCount = details.maxImageCount;
|
||||||
|
Reference in New Issue
Block a user