kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas wayland_egl: set up config depth/stencil/msaa properly.

This commit is contained in:
Hermet Park 2019-04-25 18:41:43 +09:00
parent f89fe318a7
commit 7324164a63
3 changed files with 86 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
View File

@ -31,6 +31,11 @@ struct _Evas_Engine_Info_Wayland
int x_cursor, y_cursor;
int resizing;
uint32_t timestamp;
/* window surface should be made with these config */
int depth_bits;
int stencil_bits;
int msaa_bits;
Eina_Bool dragging : 1;
Eina_Bool drag_start : 1;
Eina_Bool drag_stop : 1;

12
src/modules/evas/engines/wayland_egl/evas_engine.h
View File

@ -69,7 +69,7 @@ struct _Outbuf
int vsync;
int frame_cnt;
struct
struct
{
Eina_Bool drew : 1;
} draw;
@ -79,6 +79,16 @@ struct _Outbuf
EGLConfig egl_config;
EGLDisplay egl_disp;
struct {
unsigned char depth_buffer_size;
unsigned char stencil_buffer_size;
unsigned char msaa;
} detected;
int depth_bits;
int stencil_bits;
int msaa_bits;
Eina_Bool lost_back : 1;
Eina_Bool surf : 1;
};

92
src/modules/evas/engines/wayland_egl/evas_wl_main.c
View File

@ -15,10 +15,11 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
int context_attrs[3];
int config_attrs[40];
int major_version, minor_version;
int num_config, n = 0;
int num_config, n;
const GLubyte *vendor, *renderer, *version;
Eina_Bool blacklist = EINA_FALSE;
struct wl_display *wl_disp;
int val = 0;
/* try to allocate space for our window */
if (!(gw = calloc(1, sizeof(Outbuf))))
@ -37,31 +38,14 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
gw->depth = einfo->info.depth;
gw->alpha = einfo->info.destination_alpha;
gw->rot = einfo->info.rotation;
gw->depth_bits = einfo->depth_bits;
gw->stencil_bits = einfo->stencil_bits;
gw->msaa_bits = einfo->msaa_bits;
context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
context_attrs[1] = 2;
context_attrs[2] = EGL_NONE;
config_attrs[n++] = EGL_SURFACE_TYPE;
config_attrs[n++] = EGL_WINDOW_BIT;
config_attrs[n++] = EGL_RENDERABLE_TYPE;
config_attrs[n++] = EGL_OPENGL_ES2_BIT;
config_attrs[n++] = EGL_RED_SIZE;
config_attrs[n++] = 1;
config_attrs[n++] = EGL_GREEN_SIZE;
config_attrs[n++] = 1;
config_attrs[n++] = EGL_BLUE_SIZE;
config_attrs[n++] = 1;
config_attrs[n++] = EGL_ALPHA_SIZE;
config_attrs[n++] = 8 * !!gw->alpha;
config_attrs[n++] = EGL_DEPTH_SIZE;
config_attrs[n++] = 0;
config_attrs[n++] = EGL_STENCIL_SIZE;
config_attrs[n++] = 0;
config_attrs[n++] = EGL_NONE;
/* FIXME: Remove this line as soon as eglGetDisplay() autodetection
* gets fixed. Currently it is incorrectly detecting wl_display and
* returning _EGL_PLATFORM_X11 instead of _EGL_PLATFORM_WAYLAND.
@ -91,11 +75,65 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
return NULL;
}
try_again:
n = 0;
config_attrs[n++] = EGL_SURFACE_TYPE;
config_attrs[n++] = EGL_WINDOW_BIT;
config_attrs[n++] = EGL_RENDERABLE_TYPE;
config_attrs[n++] = EGL_OPENGL_ES2_BIT;
config_attrs[n++] = EGL_RED_SIZE;
config_attrs[n++] = 1;
config_attrs[n++] = EGL_GREEN_SIZE;
config_attrs[n++] = 1;
config_attrs[n++] = EGL_BLUE_SIZE;
config_attrs[n++] = 1;
config_attrs[n++] = EGL_ALPHA_SIZE;
config_attrs[n++] = 8 * !!gw->alpha;
config_attrs[n++] = EGL_DEPTH_SIZE;
config_attrs[n++] = gw->depth_bits;
config_attrs[n++] = EGL_STENCIL_SIZE;
config_attrs[n++] = gw->stencil_bits;
if (gw->msaa_bits > 0)
{
config_attrs[n++] = EGL_SAMPLE_BUFFERS;
config_attrs[n++] = 1;
config_attrs[n++] = EGL_SAMPLES;
config_attrs[n++] = gw->msaa_bits;
}
config_attrs[n++] = EGL_NONE;
num_config = 0;
if (!eglChooseConfig(gw->egl_disp, config_attrs, &gw->egl_config,
1, &num_config) || (num_config != 1))
{
ERR("eglChooseConfig() fail. code=%#x", eglGetError());
if ((gw->depth_bits > 24) || (gw->stencil_bits > 8))
{
WRN("Please note that your driver might not support 32-bit depth or "
"16-bit stencil buffers, so depth24, stencil8 are the maximum "
"recommended values.");
if (gw->depth_bits > 24) gw->depth_bits = 24;
if (gw->stencil_bits > 8) gw->stencil_bits = 8;
DBG("Trying again with depth:%d, stencil:%d", gw->depth_bits, gw->stencil_bits);
goto try_again;
}
else if (gw->msaa_bits)
{
gw->msaa_bits /= 2;
DBG("Trying again with msaa_samples: %d", gw->msaa_bits);
goto try_again;
}
else if (gw->depth_bits || gw->stencil_bits)
{
gw->depth_bits = 0;
gw->stencil_bits = 0;
DBG("Trying again without any depth or stencil buffer");
goto try_again;
}
eng_window_free(gw);
return NULL;
}
@ -149,6 +187,16 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
return NULL;
}
eglGetConfigAttrib(gw->egl_disp, gw->egl_config, EGL_DEPTH_SIZE, &val);
gw->detected.depth_buffer_size = val;
DBG("Detected depth size %d", val);
eglGetConfigAttrib(gw->egl_disp, gw->egl_config, EGL_STENCIL_SIZE, &val);
gw->detected.stencil_buffer_size = val;
DBG("Detected stencil size %d", val);
eglGetConfigAttrib(gw->egl_disp, gw->egl_config, EGL_SAMPLES, &val);
gw->detected.msaa = val;
DBG("Detected msaa %d", val);
if (!gw->gl_context)
{
eng_gl_symbols(gw->egl_disp);
@ -167,7 +215,7 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Output_Swap
return gw;
}
void
void
eng_window_free(Outbuf *gw)
{
int ref = 0;