added a 'default' swap chain

libobs-opengl/gl-subsystem.c

@@ -6,8 +6,9 @@ device_t device_create(struct gs_init_data *info)
 	struct gs_device *device = bmalloc(sizeof(struct gs_device));
 	memset(device, 0, sizeof(struct gs_device));
 
-	device->plat = gl_platform_create(info);
+	device->plat = gl_platform_create(device, info);
 	if (!device->plat) {
+		blog(LOG_ERROR, "device_create (GL) failed");
 		bfree(device);
 		return NULL;
 	}
@@ -23,10 +24,21 @@ void device_destroy(device_t device)
 	}
 }
 
-swapchain_t device_create_swapchain(device_t device,
-		struct gs_init_data *data)
+swapchain_t device_create_swapchain(device_t device, struct gs_init_data *info)
 {
-	
+	struct gs_swap_chain *swap = bmalloc(sizeof(struct gs_swap_chain));
+	memset(swap, 0, sizeof(struct gs_swap_chain));
+
+	swap->device = device;
+	swap->info   = *info;
+	swap->wi     = gl_windowinfo_create(info);
+	if (!swap->wi) {
+		blog(LOG_ERROR, "device_create_swapchain (GL) failed");
+		swapchain_destroy(swap);
+		return NULL;
+	}
+
+	return swap;
 }
 
 void device_resize(device_t device, uint32_t x, uint32_t y)
@@ -319,11 +331,11 @@ void device_projection_pop(device_t device)
 {
 }
 
-void     swapchain_destroy(swapchain_t swapchain)
+void swapchain_destroy(swapchain_t swapchain)
 {
 }
 
-void     texture_destroy(texture_t tex)
+void texture_destroy(texture_t tex)
 {
 }
 
@@ -339,15 +351,15 @@ enum gs_color_format texture_getcolorformat(texture_t tex)
 {
 }
 
-bool     texture_map(texture_t tex, void **ptr, uint32_t *byte_width)
+bool texture_map(texture_t tex, void **ptr, uint32_t *byte_width)
 {
 }
 
-void     texture_unmap(texture_t tex)
+void texture_unmap(texture_t tex)
 {
 }
 
-void     cubetexture_destroy(texture_t cubetex)
+void cubetexture_destroy(texture_t cubetex)
 {
 }
 
@@ -359,7 +371,7 @@ enum gs_color_format cubetexture_getcolorformat(texture_t cubetex)
 {
 }
 
-void     volumetexture_destroy(texture_t voltex)
+void volumetexture_destroy(texture_t voltex)
 {
 }
 
@@ -379,7 +391,7 @@ enum gs_color_format volumetexture_getcolorformat(texture_t voltex)
 {
 }
 
-void     stagesurface_destroy(stagesurf_t stagesurf)
+void stagesurface_destroy(stagesurf_t stagesurf)
 {
 }
 
@@ -395,12 +407,12 @@ enum gs_color_format stagesurface_getcolorformat(stagesurf_t stagesurf)
 {
 }
 
-bool     stagesurface_map(stagesurf_t stagesurf, const void **data,
+bool stagesurface_map(stagesurf_t stagesurf, const void **data,
 		uint32_t *byte_width)
 {
 }
 
-void     stagesurface_unmap(stagesurf_t stagesurf)
+void stagesurface_unmap(stagesurf_t stagesurf)
 {
 }
 
@@ -424,15 +436,15 @@ struct vb_data *vertexbuffer_getdata(vertbuffer_t vertbuffer)
 {
 }
 
-void   indexbuffer_destroy(indexbuffer_t indexbuffer)
+void indexbuffer_destroy(indexbuffer_t indexbuffer)
 {
 }
 
-void   indexbuffer_flush(indexbuffer_t indexbuffer)
+void indexbuffer_flush(indexbuffer_t indexbuffer)
 {
 }
 
-void  *indexbuffer_getdata(indexbuffer_t indexbuffer)
+void *indexbuffer_getdata(indexbuffer_t indexbuffer)
 {
 }
 

libobs-opengl/gl-subsystem.h

@@ -24,9 +24,10 @@
 struct gl_platform;
 struct gl_windowinfo;
 
-
 struct gs_swap_chain {
-	struct gl_windowinfo *window;
+	device_t device;
+	struct gl_windowinfo *wi;
+	struct gs_init_data  info;
 };
 
 struct gs_device {
@@ -35,8 +36,10 @@ struct gs_device {
 	struct gs_swap_chain *cur_swap;
 };
 
-extern struct gl_platform *gl_platform_create(struct gs_init_data *info);
-extern void                gl_platform_destroy(struct gl_platform *platform);
+extern struct gl_platform   *gl_platform_create(device_t device,
+                                                struct gs_init_data *info);
+extern struct gs_swap_chain *gl_platform_getswap(struct gl_platform *platform);
+extern void                  gl_platform_destroy(struct gl_platform *platform);
 
 extern struct gl_windowinfo *gl_windowinfo_create(struct gs_init_data *info);
 extern void                  gl_windowinfo_destroy(struct gl_windowinfo *wi);

libobs-opengl/gl-windows.c

@@ -5,16 +5,21 @@
 #include "gl-subsystem.h"
 #include "glew/include/GL/wglew.h"
 
+/* Basically swapchain-specific information.  Fortunately for windows this is
+ * super basic stuff */
 struct gl_windowinfo {
 	HWND hwnd;
 	HDC  hdc;
 };
 
+/* Like the other subsystems, the GL subsystem has one swap chain created by
+ * default. */
 struct gl_platform {
 	HGLRC hrc;
-	struct gl_windowinfo *wi;
+	struct gs_swap_chain swap;
 };
 
+/* For now, only support basic 32bit formats for graphics output. */
 static inline int get_color_format_bits(enum gs_color_format format)
 {
 	switch (format) {
@@ -71,6 +76,7 @@ struct dummy_context {
 	HDC   hdc;
 };
 
+/* Need a dummy window for the dummy context */
 static bool gl_register_dummy_window_class(void)
 {
 	WNDCLASSA wc;
@@ -104,7 +110,7 @@ static inline HWND gl_create_dummy_window(void)
 	return hwnd;
 }
 
-static HGLRC gl_init_context(HDC hdc)
+static inline HGLRC gl_init_context(HDC hdc)
 {
 	HGLRC hglrc = wglCreateContext(hdc);
 	if (!hglrc) {
@@ -158,7 +164,7 @@ static bool gl_dummy_context_init(struct dummy_context *dummy)
 	return true;
 }
 
-static void gl_dummy_context_free(struct dummy_context *dummy)
+static inline void gl_dummy_context_free(struct dummy_context *dummy)
 {
 	wglMakeCurrent(NULL, NULL);
 	wglDeleteContext(dummy->hrc);
@@ -204,6 +210,7 @@ static inline void add_attrib(struct darray *list, int attrib, int val)
 	darray_push_back(sizeof(int), list, &val);
 }
 
+/* Creates the real pixel format for the target window */
 static int gl_choose_pixel_format(HDC hdc, struct gs_init_data *info)
 {
 	struct darray attribs;
@@ -272,7 +279,40 @@ static inline bool gl_set_pixel_format(HDC hdc, int format,
 	return true;
 }
 
-struct gl_platform *gl_platform_create(struct gs_init_data *info)
+static struct gl_windowinfo *gl_windowinfo_bare(struct gs_init_data *info)
+{
+	struct gl_windowinfo *wi = bmalloc(sizeof(struct gl_windowinfo));
+	memset(wi, 0, sizeof(struct gl_windowinfo));
+
+	wi->hwnd = info->hwnd;
+	wi->hdc  = GetDC(wi->hwnd);
+	if (!wi->hdc) {
+		blog(LOG_ERROR, "Unable to get device context from window");
+		bfree(wi);
+		return NULL;
+	}
+
+	return wi;
+}
+
+static bool init_default_swap(struct gl_platform *plat, device_t device,
+		int pixel_format, PIXELFORMATDESCRIPTOR *pfd,
+		struct gs_init_data *info)
+{
+	plat->swap.device = device;
+	plat->swap.info   = *info;
+	plat->swap.wi     = gl_windowinfo_bare(info);
+	if (!plat->swap.wi)
+		return false;
+
+	if (!gl_set_pixel_format(plat->swap.wi->hdc, pixel_format, pfd))
+		return false;
+
+	return true;
+}
+
+struct gl_platform *gl_platform_create(device_t device,
+		struct gs_init_data *info)
 {
 	struct gl_platform *plat = bmalloc(sizeof(struct gl_platform));
 	struct dummy_context dummy;
@@ -295,25 +335,27 @@ struct gl_platform *gl_platform_create(struct gs_init_data *info)
 
 	gl_dummy_context_free(&dummy);
 
-	plat->wi = gl_windowinfo_create(info);
-	if (!plat->wi)
+	if (!init_default_swap(plat, device, pixel_format, &pfd, info))
 		goto fail;
 
-	if (!gl_set_pixel_format(plat->wi->hdc, pixel_format, &pfd))
-		goto fail;
-
-	plat->hrc = gl_init_context(plat->wi->hdc);
+	plat->hrc = gl_init_context(plat->swap.wi->hdc);
 	if (!plat->hrc)
 		goto fail;
 
 	return plat;
 
 fail:
+	blog(LOG_ERROR, "gl_platform_create failed");
 	gl_platform_destroy(plat);
 	gl_dummy_context_free(&dummy);
 	return NULL;
 }
 
+struct gs_swap_chain *gl_platform_getswap(struct gl_platform *platform)
+{
+	return &platform->swap;
+}
+
 void gl_platform_destroy(struct gl_platform *plat)
 {
 	if (plat) {
@@ -322,25 +364,32 @@ void gl_platform_destroy(struct gl_platform *plat)
 			wglDeleteContext(plat->hrc);
 		}
 
-		gl_windowinfo_destroy(plat->wi);
+		gl_windowinfo_destroy(plat->swap.wi);
 		bfree(plat);
 	}
 }
 
 struct gl_windowinfo *gl_windowinfo_create(struct gs_init_data *info)
 {
-	struct gl_windowinfo *wi = bmalloc(sizeof(struct gl_windowinfo));
-	memset(wi, 0, sizeof(struct gl_windowinfo));
+	struct gl_windowinfo *wi = gl_windowinfo_bare(info);
+	PIXELFORMATDESCRIPTOR pfd;
+	int pixel_format;
 
-	wi->hwnd = info->hwnd;
-	wi->hdc  = GetDC(wi->hwnd);
-	if (!wi->hdc) {
-		blog(LOG_ERROR, "Unable to get device context from window");
-		bfree(wi);
+	if (!wi)
 		return NULL;
-	}
+
+	if (!gl_get_pixel_format(wi->hdc, info, &pixel_format, &pfd))
+		goto fail;
+
+	if (!gl_set_pixel_format(wi->hdc, pixel_format, &pfd))
+		goto fail;
 
 	return wi;
+
+fail:
+	blog(LOG_ERROR, "gl_windowinfo_create failed");
+	gl_windowinfo_destroy(wi);
+	return NULL;
 }
 
 void gl_windowinfo_destroy(struct gl_windowinfo *wi)