jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move from glLoadGen to GLAD

Browse Source
This commit is contained in:
BtbN
2014-04-14 23:28:07 +02:00
parent 334792a62c
commit e50201cad1
12 changed files with 22 additions and 24581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libobs-opengl/gl-windows.c
View File

@@ -20,7 +20,7 @@
#include <util/darray.h>
#include "gl-subsystem.h"
#include "GL/wgl_obs.h"
#include <glad/glad_wgl.h>
/* Basically swapchain-specific information. Fortunately for windows this is
* super basic stuff */
@@ -165,7 +165,7 @@ static const int attribs[] =
static inline HGLRC gl_init_context(HDC hdc)
{
#ifdef _DEBUG
if (wgl_ext_ARB_create_context) {
if (GLAD_WGL_ARB_create_context) {
HGLRC hglrc = wglCreateContextAttribsARB(hdc, 0, attribs);
if (!hglrc) {
blog(LOG_ERROR, "wglCreateContextAttribsARB failed, %u",
@@ -237,22 +237,22 @@ static inline void required_extension_error(const char *extension)
static bool gl_init_extensions(HDC hdc)
{
if (!wgl_LoadFunctions(hdc)) {
if (!gladLoadWGL(hdc)) {
blog(LOG_ERROR, "Failed to load WGL entry functions.");
return false;
}
if (!wgl_ext_ARB_pixel_format) {
if (!GLAD_WGL_ARB_pixel_format) {
required_extension_error("ARB_pixel_format");
return false;
}
if (!wgl_ext_ARB_create_context) {
if (!GLAD_WGL_ARB_create_context) {
required_extension_error("ARB_create_context");
return false;
}
if (!wgl_ext_ARB_create_context_profile) {
if (!GLAD_WGL_ARB_create_context_profile) {
required_extension_error("ARB_create_context_profile");
return false;
}
@@ -400,7 +400,7 @@ struct gl_platform *gl_platform_create(device_t device,
if (!plat->hrc)
goto fail;
if (!ogl_LoadFunctions()) {
if (!gladLoadGL()) {
blog(LOG_ERROR, "Failed to initialize OpenGL entry functions.");
goto fail;
}