X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrfileman;a=blobdiff_plain;f=src%2Fmain.cc;fp=src%2Fmain.cc;h=69b7efa5f644de700ac1dd5f9cd70d5c74f0dca3;hp=04f85236714a049353d92b91d8b1ae0473a404ed;hb=20f18dc9afa4e7a9efb6253edce231f664d14215;hpb=f737a4688a44fa05c9a5ea7919819437fae85ae1

diff --git a/src/main.cc b/src/main.cc
index 04f8523..69b7efa 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -10,6 +10,18 @@ static SDL_GLContext ctx;
 static bool redraw_pending = true;
 static bool quit;
 
+static SDL_Window *create_window(int width, int height)
+{
+	SDL_Window *win;
+	int x = SDL_WINDOWPOS_UNDEFINED;
+	int y = SDL_WINDOWPOS_UNDEFINED;
+	unsigned int flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
+	if(!(win = SDL_CreateWindow("vrfileman", x, y, width, height, flags))) {
+		return 0;
+	}
+	return win;
+}
+
 int main(int argc, char **argv)
 {
 	if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1) {
@@ -18,17 +30,18 @@ int main(int argc, char **argv)
 	}
 
 	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
-	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
+	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 8);
 	SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 1);
 
-	int x = SDL_WINDOWPOS_UNDEFINED;
-	int y = SDL_WINDOWPOS_UNDEFINED;
-	unsigned int flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
-	win_width = 1280;
-	win_height = 800;
-	if(!(win = SDL_CreateWindow("vrfileman", x, y, win_width, win_height, flags))) {
-		fprintf(stderr, "failed to create window\n");
-		return 1;
+	if(!(win = create_window(def_opt.width, def_opt.height))) {
+		// try again without the SRGB capability
+		SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 0);
+		if(!(win = create_window(win_width, win_height))) {
+			fprintf(stderr, "failed to create window\n");
+			return 1;
+		}
+		fprintf(stderr, "failed to create sRGB-capable window, defaulting to non-linear color space\n");
+		def_opt.srgb = false;
 	}
 
 	if(!(ctx = SDL_GL_CreateContext(win))) {