Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced ad hoc bubble sort with libc qsort.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-13 16:24:25 +02:00
parent 1c55f68fb6
commit a95279e63d
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/fullscreen.c
View File

@ -30,6 +30,33 @@
#include "internal.h" #include "internal.h"
#include <stdlib.h>
static int compareVideoModes(const void* firstPtr, const void* secondPtr)
{
GLFWvidmode* first = (GLFWvidmode*) firstPtr;
GLFWvidmode* second = (GLFWvidmode*) secondPtr;
// First sort on color bits per pixel
int firstBPP = first->redBits +
first->greenBits +
first->blueBits;
int secondBPP = second->redBits +
second->greenBits +
second->blueBits;
if (firstBPP != secondBPP)
return firstBPP - secondBPP;
// Then sort on screen area, in pixels
int firstSize = first->width * first->height;
int secondSize = second->width * second->height;
return firstSize - secondSize;
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////// GLFW public API ////// ////// GLFW public API //////
@ -41,8 +68,7 @@
GLFWAPI int glfwGetVideoModes(GLFWvidmode* list, int maxcount) GLFWAPI int glfwGetVideoModes(GLFWvidmode* list, int maxcount)
{ {
int count, i, swap, res1, res2, depth1, depth2; int count;
GLFWvidmode vm;
if (!_glfwInitialized) if (!_glfwInitialized)
{ {
@ -59,28 +85,8 @@ GLFWAPI int glfwGetVideoModes(GLFWvidmode* list, int maxcount)
// Get list of video modes // Get list of video modes
count = _glfwPlatformGetVideoModes(list, maxcount); count = _glfwPlatformGetVideoModes(list, maxcount);
// Sort list (bubble sort) if (count > 0)
do qsort(list, count, sizeof(GLFWvidmode), compareVideoModes);
{
swap = 0;
for (i = 0; i < count - 1; i++)
{
res1 = list[i].width * list[i].height;
depth1 = list[i].redBits + list[i].greenBits + list[i].blueBits;
res2 = list[i + 1].width * list[i + 1].height;
depth2 = list[i + 1].redBits + list[i + 1].greenBits +
list[i + 1].blueBits;
if ((depth2 < depth1) || ((depth2 == depth1) && (res2 < res1)))
{
vm = list[i];
list[i] = list[i + 1];
list[i + 1] = vm;
swap = 1;
}
}
}
while (swap);
return count; return count;
} }