mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 01:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

opengl: remove unnecessary second check for requested version at the end, add ES1/2 version checks when built with ES3, add 3.1/3.0 version checks

Browse Source
This commit is contained in:
Brad Parker 2019-08-07 12:24:24 -04:00
parent 7b96ee1a31
commit b97069aa6d
2 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gfx/drivers_context/wgl_ctx.c
View File

@ -281,7 +281,7 @@ static void create_gl_context(HWND hwnd, bool *quit)
if (pcreate_context) if (pcreate_context)
{ {
int i; int i;
int gl_versions[][2] = {{4, 6}, {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3}, {3, 2}, {0, 0}}; int gl_versions[][2] = {{4, 6}, {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3}, {3, 2}, {3, 1}, {3, 0}};
int gl_version_rows = ARRAY_SIZE(gl_versions); int gl_version_rows = ARRAY_SIZE(gl_versions);
int (*versions)[2]; int (*versions)[2];
int version_rows = 0; int version_rows = 0;
@ -293,13 +293,6 @@ static void create_gl_context(HWND hwnd, bool *quit)
/* try each version, starting with the highest first */ /* try each version, starting with the highest first */
for (i = 0; i < version_rows; i++) for (i = 0; i < version_rows; i++)
{ {
if (versions[i][0] == 0 && versions[i][1] == 0)
{
/* use the actual requested version last */
versions[i][0] = win32_major;
versions[i][1] = win32_minor;
}
attribs[1] = versions[i][0]; attribs[1] = versions[i][0];
attribs[3] = versions[i][1]; attribs[3] = versions[i][1];
@ -316,31 +309,32 @@ static void create_gl_context(HWND hwnd, bool *quit)
*quit = true; *quit = true;
break; break;
} }
if (win32_use_hw_ctx)
{
win32_hw_hrc = pcreate_context(win32_hdc, context, attribs);
if (!win32_hw_hrc)
{
RARCH_ERR("[WGL]: Failed to create shared context.\n");
*quit = true;
break;
}
}
/* found a suitable version that is high enough, we can stop now */
break;
} }
else else
{ {
if (versions[i][0] == win32_major && versions[i][1] == win32_minor) if (versions[i][0] == win32_major && versions[i][1] == win32_minor)
{ {
/* The requested version is not supported, go ahead and fail since everything else will be lower than that. */ /* The requested version was tried and is not supported, go ahead and fail since everything else will be lower than that. */
break; break;
} }
continue; continue;
} }
if (win32_use_hw_ctx)
{
win32_hw_hrc = pcreate_context(win32_hdc, context, attribs);
if (!win32_hw_hrc)
{
RARCH_ERR("[WGL]: Failed to create shared context.\n");
*quit = true;
break;
}
}
break;
} }
if (!context) if (!context)

46
gfx/drivers_context/x_ctx.c
View File

@ -871,11 +871,11 @@ static bool gfx_ctx_x_set_video_mode(void *data,
*/ */
{ {
int i; int i;
int gl_versions[][2] = {{4, 6}, {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3}, {3, 2}, {0, 0}}; int gl_versions[][2] = {{4, 6}, {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3}, {3, 2}, {3, 1}, {3, 0}};
#ifdef HAVE_OPENGLES3 #ifdef HAVE_OPENGLES3
int gles_versions[][2] = {{3, 2}, {3, 1}, {3, 0}, {0, 0}}; int gles_versions[][2] = {{3, 2}, {3, 1}, {3, 0}, {2, 0}, {1, 1}, {1, 0}};
#else #else
int gles_versions[][2] = {{2, 1}, {2, 0}, {1, 1}, {1, 0}, {0, 0}}; int gles_versions[][2] = {{2, 0}, {1, 1}, {1, 0}};
#endif #endif
int gl_version_rows = ARRAY_SIZE(gl_versions); int gl_version_rows = ARRAY_SIZE(gl_versions);
int gles_version_rows = ARRAY_SIZE(gles_versions); int gles_version_rows = ARRAY_SIZE(gles_versions);
@ -896,44 +896,36 @@ static bool gfx_ctx_x_set_video_mode(void *data,
/* try each version, starting with the highest first */ /* try each version, starting with the highest first */
for (i = 0; i < version_rows; i++) for (i = 0; i < version_rows; i++)
{ {
if (versions[i][0] == 0 && versions[i][1] == 0)
{
/* use the actual requested version last */
versions[i][0] = g_major;
versions[i][1] = g_minor;
}
attribs[1] = versions[i][0]; attribs[1] = versions[i][0];
attribs[3] = versions[i][1]; attribs[3] = versions[i][1];
x->g_ctx = glx_create_context_attribs(g_x11_dpy, x->g_ctx = glx_create_context_attribs(g_x11_dpy,
x->g_fbc, NULL, True, attribs); x->g_fbc, NULL, True, attribs);
if (!x->g_ctx) if (x->g_ctx)
{
if (x->g_use_hw_ctx)
{
RARCH_LOG("[GLX]: Creating shared HW context.\n");
x->g_hw_ctx = glx_create_context_attribs(g_x11_dpy,
x->g_fbc, x->g_ctx, True, attribs);
if (!x->g_hw_ctx)
RARCH_ERR("[GLX]: Failed to create new shared context.\n");
}
break;
}
else
{ {
if (versions[i][0] == g_major && versions[i][1] == g_minor) if (versions[i][0] == g_major && versions[i][1] == g_minor)
{ {
/* The requested version is not supported, go ahead and fail since everything else will be lower than that. */ /* The requested version was tried and is not supported, go ahead and fail since everything else will be lower than that. */
break; break;
} }
continue; continue;
} }
if (x->g_use_hw_ctx)
{
RARCH_LOG("[GLX]: Creating shared HW context.\n");
x->g_hw_ctx = glx_create_context_attribs(g_x11_dpy,
x->g_fbc, x->g_ctx, True, attribs);
if (!x->g_hw_ctx)
RARCH_ERR("[GLX]: Failed to create new shared context.\n");
}
g_major = versions[i][0];
g_minor = versions[i][1];
break;
} }
} }