From abaac3ea999fe0316cc948ce7c6cb5ebd339dc1f Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sat, 11 Sep 2010 14:32:05 +0200 Subject: [PATCH] Added GLFW error strings to test programs, various tweaks. --- tests/accuracy.c | 4 ++-- tests/defaults.c | 4 ++-- tests/events.c | 4 ++-- tests/fsaa.c | 4 ++-- tests/iconify.c | 4 ++-- tests/joysticks.c | 8 +++++++- tests/peter.c | 10 +++++----- tests/reopen.c | 12 +++++------- tests/tearing.c | 10 +++++----- tests/version.c | 8 ++++---- tests/windows.c | 4 ++-- 11 files changed, 38 insertions(+), 34 deletions(-) diff --git a/tests/accuracy.c b/tests/accuracy.c index db8307a7..677aea20 100644 --- a/tests/accuracy.c +++ b/tests/accuracy.c @@ -61,7 +61,7 @@ int main(void) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } @@ -70,7 +70,7 @@ int main(void) { glfwTerminate(); - fprintf(stderr, "Failed to open GLFW window\n"); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } diff --git a/tests/defaults.c b/tests/defaults.c index b97ba671..65eca894 100644 --- a/tests/defaults.c +++ b/tests/defaults.c @@ -71,7 +71,7 @@ int main(void) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); exit(1); } @@ -80,7 +80,7 @@ int main(void) { glfwTerminate(); - fprintf(stderr, "Failed to open GLFW default window\n"); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); exit(1); } diff --git a/tests/events.c b/tests/events.c index bd296fd8..ce44f018 100644 --- a/tests/events.c +++ b/tests/events.c @@ -268,7 +268,7 @@ int main(void) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); exit(1); } @@ -279,7 +279,7 @@ int main(void) { glfwTerminate(); - fprintf(stderr, "Failed to create GLFW window"); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); exit(1); } diff --git a/tests/fsaa.c b/tests/fsaa.c index 5950e74d..022af638 100644 --- a/tests/fsaa.c +++ b/tests/fsaa.c @@ -49,7 +49,7 @@ int main(void) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } @@ -60,7 +60,7 @@ int main(void) { glfwTerminate(); - fprintf(stderr, "Failed to open GLFW window\n"); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } diff --git a/tests/iconify.c b/tests/iconify.c index 14c6e726..a04637f9 100644 --- a/tests/iconify.c +++ b/tests/iconify.c @@ -91,7 +91,7 @@ int main(int argc, char** argv) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } @@ -112,7 +112,7 @@ int main(int argc, char** argv) { glfwTerminate(); - fprintf(stderr, "Failed to open GLFW window\n"); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } diff --git a/tests/joysticks.c b/tests/joysticks.c index 427e2c8b..23ac88a3 100644 --- a/tests/joysticks.c +++ b/tests/joysticks.c @@ -6,6 +6,7 @@ #include #include +#include #include #define MAX_AXES 10 @@ -93,7 +94,12 @@ int main(void) double update; /* Initialise GLFW */ - glfwInit(); + if (!glfwInit()) + { + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); + exit(EXIT_FAILURE); + } + printf("The program will work for 20 seconds and display every seconds the state of the joysticks\n"); printf("Your computer is going to be very slow as the program is doing an active loop .....\n"); diff --git a/tests/peter.c b/tests/peter.c index 1ae3014c..277502f3 100644 --- a/tests/peter.c +++ b/tests/peter.c @@ -110,16 +110,16 @@ int main(void) { if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); - exit(1); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); + exit(EXIT_FAILURE); } if (!open_window()) { glfwTerminate(); - fprintf(stderr, "Failed to open GLFW window\n"); - exit(1); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); + exit(EXIT_FAILURE); } glClearColor(0.f, 0.f, 0.f, 0.f); @@ -133,6 +133,6 @@ int main(void) } glfwTerminate(); - exit(0); + exit(EXIT_SUCCESS); } diff --git a/tests/reopen.c b/tests/reopen.c index 3276b811..789b09e3 100644 --- a/tests/reopen.c +++ b/tests/reopen.c @@ -84,12 +84,10 @@ static int open_window(int width, int height, int mode) { double base = glfwGetTime(); - glfwOpenWindowHint(GLFW_DEPTH_BITS, 16); - window_handle = glfwOpenWindow(width, height, mode); if (!window_handle) { - fprintf(stderr, "Failed to create %s mode GLFW window\n", get_mode_name(mode)); + fprintf(stderr, "Failed to open %s mode GLFW window: %s\n", get_mode_name(mode), glfwErrorString(glfwGetError())); return 0; } @@ -122,8 +120,8 @@ int main(int argc, char** argv) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); - exit(1); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); + exit(EXIT_FAILURE); } for (;;) @@ -131,7 +129,7 @@ int main(int argc, char** argv) if (!open_window(640, 480, (count & 1) ? GLFW_FULLSCREEN : GLFW_WINDOWED)) { glfwTerminate(); - exit(1); + exit(EXIT_FAILURE); } glMatrixMode(GL_PROJECTION); @@ -163,7 +161,7 @@ int main(int argc, char** argv) printf("User closed window\n"); glfwTerminate(); - exit(0); + exit(EXIT_SUCCESS); } } diff --git a/tests/tearing.c b/tests/tearing.c index 719cfbc2..21278878 100644 --- a/tests/tearing.c +++ b/tests/tearing.c @@ -46,8 +46,8 @@ int main(void) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); - exit(1); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); + exit(EXIT_FAILURE); } window = glfwOpenWindow(0, 0, GLFW_WINDOWED); @@ -55,8 +55,8 @@ int main(void) { glfwTerminate(); - fprintf(stderr, "Failed to open GLFW window\n"); - exit(1); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); + exit(EXIT_FAILURE); } glfwSetWindowTitle(window, "Tearing Detector"); @@ -82,6 +82,6 @@ int main(void) } glfwTerminate(); - exit(0); + exit(EXIT_SUCCESS); } diff --git a/tests/version.c b/tests/version.c index 5e6b1f70..0e05ca68 100644 --- a/tests/version.c +++ b/tests/version.c @@ -58,7 +58,7 @@ typedef const GLubyte * (APIENTRY *PFNGLGETSTRINGI) (GLenum, GLuint); static void usage(void) { - printf("version [-h] [-m MAJOR] [-n MINOR] [-d] [-l] [-f] [-p PROFILE]\n"); + printf("Usage: version [-h] [-m MAJOR] [-n MINOR] [-d] [-l] [-f] [-p PROFILE]\n"); printf("available profiles: core compat\n"); } @@ -85,7 +85,7 @@ static void list_extensions(int major, int minor) PFNGLGETSTRINGI glGetStringi = (PFNGLGETSTRINGI) glfwGetProcAddress("glGetStringi"); if (!glGetStringi) { - fprintf(stderr, "Failed to retrieve glGetStringi entry point"); + fprintf(stderr, "Failed to retrieve glGetStringi entry point: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } @@ -161,7 +161,7 @@ int main(int argc, char** argv) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } @@ -187,7 +187,7 @@ int main(int argc, char** argv) { glfwTerminate(); - fprintf(stderr, "Failed to open GLFW window\n"); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); } diff --git a/tests/windows.c b/tests/windows.c index 5212852b..8fee0741 100644 --- a/tests/windows.c +++ b/tests/windows.c @@ -45,7 +45,7 @@ static GLFWwindow open_window(int width, int height, const char* title) GLFWwindow window = glfwOpenWindow(width, height, GLFW_WINDOWED); if (!window) { - fprintf(stderr, "Failed to open GLFW default window\n"); + fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError())); return NULL; } @@ -62,7 +62,7 @@ int main(void) if (!glfwInit()) { - fprintf(stderr, "Failed to initialize GLFW\n"); + fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); exit(EXIT_FAILURE); }