Pārlūkot izejas kodu

Make instance extension count unsigned

Fixes #714.
Camilla Berglund 9 gadi atpakaļ
vecāks
revīzija
7669ade19c
11 mainītis faili ar 12 papildinājumiem un 12 dzēšanām
  1. 1 1
      docs/vulkan.dox
  2. 1 1
      include/GLFW/glfw3.h
  3. 1 1
      src/cocoa_window.m
  4. 2 2
      src/internal.h
  5. 1 1
      src/mir_window.c
  6. 1 1
      src/vulkan.c
  7. 1 1
      src/win32_window.c
  8. 1 1
      src/wl_window.c
  9. 1 1
      src/x11_window.c
  10. 1 1
      tests/glfwinfo.c
  11. 1 1
      tests/vulkan.c

+ 1 - 1
docs/vulkan.dox

@@ -127,7 +127,7 @@ To query the instance extensions required, call @ref
 glfwGetRequiredInstanceExtensions.
 
 @code
-int count;
+unsigned int count;
 const char** extensions = glfwGetRequiredInstanceExtensions(&count);
 @endcode
 

+ 1 - 1
include/GLFW/glfw3.h

@@ -3785,7 +3785,7 @@ GLFWAPI int glfwVulkanSupported(void);
  *
  *  @ingroup vulkan
  */
-GLFWAPI const char** glfwGetRequiredInstanceExtensions(int* count);
+GLFWAPI const char** glfwGetRequiredInstanceExtensions(unsigned int* count);
 
 #if defined(VK_VERSION_1_0)
 

+ 1 - 1
src/cocoa_window.m

@@ -1339,7 +1339,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return _glfw.ns.clipboardString;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 {
     *count = 0;
     return NULL;

+ 2 - 2
src/internal.h

@@ -438,7 +438,7 @@ struct _GLFWlibrary
         GLFWbool        available;
         void*           handle;
         char**          extensions;
-        int             extensionCount;
+        unsigned int    extensionCount;
         PFN_vkEnumerateInstanceExtensionProperties EnumerateInstanceExtensionProperties;
         PFN_vkGetInstanceProcAddr GetInstanceProcAddr;
         GLFWbool        KHR_surface;
@@ -784,7 +784,7 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor);
 
 /*! @ingroup platform
  */
-char** _glfwPlatformGetRequiredInstanceExtensions(int* count);
+char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count);
 
 /*! @ingroup platform
  */

+ 1 - 1
src/mir_window.c

@@ -719,7 +719,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return NULL;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 {
     char** extensions;
 

+ 1 - 1
src/vulkan.c

@@ -196,7 +196,7 @@ GLFWAPI int glfwVulkanSupported(void)
     return _glfw.vk.available;
 }
 
-GLFWAPI const char** glfwGetRequiredInstanceExtensions(int* count)
+GLFWAPI const char** glfwGetRequiredInstanceExtensions(unsigned int* count)
 {
     *count = 0;
 

+ 1 - 1
src/win32_window.c

@@ -1418,7 +1418,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return _glfw.win32.clipboardString;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 {
     char** extensions;
 

+ 1 - 1
src/wl_window.c

@@ -710,7 +710,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return NULL;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 {
     char** extensions;
 

+ 1 - 1
src/x11_window.c

@@ -2127,7 +2127,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return _glfw.x11.clipboardString;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 {
     char** extensions;
 

+ 1 - 1
tests/glfwinfo.c

@@ -798,7 +798,7 @@ int main(int argc, char** argv)
         PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
         PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
 
-        re = glfwGetRequiredInstanceExtensions((int*) &re_count);
+        re = glfwGetRequiredInstanceExtensions(&re_count);
 
         printf("Vulkan required instance extensions:");
         for (i = 0;  i < re_count;  i++)

+ 1 - 1
tests/vulkan.c

@@ -1732,7 +1732,7 @@ static void demo_init_vk(struct demo *demo) {
     }
 
     /* Look for instance extensions */
-    required_extensions = glfwGetRequiredInstanceExtensions((int*) &required_extension_count);
+    required_extensions = glfwGetRequiredInstanceExtensions(&required_extension_count);
     if (!required_extensions) {
         ERR_EXIT("glfwGetRequiredInstanceExtensions failed to find the "
                  "platform surface extensions.\n\nDo you have a compatible "