mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wayland: simpler use of function eglChooseConfig()

This commit is contained in:
ManoloFLTK 2023-07-29 14:16:18 +02:00
parent b9a89c92ea
commit b1ab37eeff
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H
View File

@ -37,7 +37,6 @@ class Fl_Wayland_Gl_Window_Driver : public Fl_Gl_Window_Driver {
friend class Fl_Wayland_Gl_Plugin; friend class Fl_Wayland_Gl_Plugin;
private: private:
static EGLDisplay egl_display; static EGLDisplay egl_display;
static EGLint configs_count;
struct wl_egl_window *egl_window; struct wl_egl_window *egl_window;
EGLSurface egl_surface; EGLSurface egl_surface;
bool egl_swap_in_progress; bool egl_swap_in_progress;

22
src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx
View File

@ -63,7 +63,6 @@ struct gl_start_support { // to support use of gl_start / gl_finish
static EGLConfig wld_egl_conf = NULL; static EGLConfig wld_egl_conf = NULL;
EGLDisplay Fl_Wayland_Gl_Window_Driver::egl_display = EGL_NO_DISPLAY; EGLDisplay Fl_Wayland_Gl_Window_Driver::egl_display = EGL_NO_DISPLAY;
EGLint Fl_Wayland_Gl_Window_Driver::configs_count = 0;
Fl_Wayland_Gl_Window_Driver::Fl_Wayland_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) { Fl_Wayland_Gl_Window_Driver::Fl_Wayland_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {
@ -97,7 +96,7 @@ void Fl_Wayland_Gl_Window_Driver::init() {
} }
//printf("EGL major: %d, minor %d\n", major, minor); //printf("EGL major: %d, minor %d\n", major, minor);
eglGetConfigs(egl_display, NULL, 0, &configs_count); //eglGetConfigs(egl_display, NULL, 0, &configs_count);
//printf("EGL has %d configs\n", configs_count); //printf("EGL has %d configs\n", configs_count);
eglBindAPI(EGL_OPENGL_API); eglBindAPI(EGL_OPENGL_API);
} }
@ -156,29 +155,16 @@ Fl_Gl_Choice *Fl_Wayland_Gl_Window_Driver::find(int m, const int *alistp)
if (m & FL_STENCIL) config_attribs[15] = 1; if (m & FL_STENCIL) config_attribs[15] = 1;
if (m & FL_ALPHA) config_attribs[17] = (m & FL_RGB8) ? 8 : 1; if (m & FL_ALPHA) config_attribs[17] = (m & FL_RGB8) ? 8 : 1;
static EGLConfig *configs = (void**)calloc(configs_count, sizeof(EGLConfig)); g = new Fl_Wayland_Gl_Choice(m, alistp, first);
eglChooseConfig(egl_display, config_attribs, configs, configs_count, &n); eglChooseConfig(egl_display, config_attribs, &(g->egl_conf), 1, &n);
if (n == 0 && (m & FL_MULTISAMPLE)) { if (n == 0 && (m & FL_MULTISAMPLE)) {
config_attribs[13] = 0; config_attribs[13] = 0;
eglChooseConfig(egl_display, config_attribs, configs, configs_count, &n); eglChooseConfig(egl_display, config_attribs, &(g->egl_conf), 1, &n);
} }
if (n == 0) { if (n == 0) {
Fl::fatal("failed to choose an EGL config\n"); Fl::fatal("failed to choose an EGL config\n");
} }
g = new Fl_Wayland_Gl_Choice(m, alistp, first);
/*for (int i = 0; i < n; i++) {
EGLint size;
eglGetConfigAttrib(egl_display, configs[i], EGL_BUFFER_SIZE, &size);
printf("Buffer size for config %d is %d\n", i, size);
eglGetConfigAttrib(egl_display, configs[i], EGL_RED_SIZE, &size);
printf("Red size for config %d is %d\n", i, size);
// just choose the first one
g->egl_conf = configs[i];
break;
}*/
// just choose the first config
g->egl_conf = configs[0];
first = g; first = g;
return g; return g;
} }