aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Weissflog <floooh@gmail.com>2022-09-20 19:57:33 +0200
committerAndre Weissflog <floooh@gmail.com>2022-09-20 19:57:33 +0200
commit523c85cd08b1f3850ee6bc4809ce22744f8d75bb (patch)
tree68549c100f28d0a3e22505b43dc8336f55bed870
parentf97bb10bcfe20ee7fedebb162a4ac66f060e4624 (diff)
sokol_app.h egl: fix warnings and code cleanup
-rw-r--r--sokol_app.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/sokol_app.h b/sokol_app.h
index eaa2dfe6..97b98714 100644
--- a/sokol_app.h
+++ b/sokol_app.h
@@ -11502,7 +11502,7 @@ _SOKOL_PRIVATE void _sapp_x11_process_event(XEvent* event) {
#if !defined(_SAPP_GLX)
-_SOKOL_PRIVATE void _sapp_egl_init() {
+_SOKOL_PRIVATE void _sapp_egl_init(void) {
#if defined(SOKOL_GLCORE33)
if (!eglBindAPI(EGL_OPENGL_API)) {
_sapp_fail("EGL: failed to bind API");
@@ -11561,8 +11561,8 @@ _SOKOL_PRIVATE void _sapp_egl_init() {
eglGetConfigAttrib(_sapp.egl.display, c, EGL_ALPHA_SIZE, &a) &&
eglGetConfigAttrib(_sapp.egl.display, c, EGL_DEPTH_SIZE, &d) &&
eglGetConfigAttrib(_sapp.egl.display, c, EGL_STENCIL_SIZE, &s) &&
- eglGetConfigAttrib(_sapp.egl.display, c, EGL_SAMPLES, &s) &&
- r == 8 && g == 8 && b == 8 && a == alpha_size && d == 24 && s == 8 && n == sample_count) {
+ eglGetConfigAttrib(_sapp.egl.display, c, EGL_SAMPLES, &n) &&
+ (r == 8) && (g == 8) && (b == 8) && (a == alpha_size) && (d == 24) && (s == 8) && (n == sample_count)) {
config = c;
break;
}
@@ -11574,7 +11574,8 @@ _SOKOL_PRIVATE void _sapp_egl_init() {
}
XVisualInfo visual_info_template;
- visual_info_template.visualid = visual_id;
+ _sapp_clear(&visual_info_template, sizeof(visual_info_template));
+ visual_info_template.visualid = (VisualID)visual_id;
int num_visuals;
XVisualInfo* visual_info = XGetVisualInfo(_sapp.x11.display, VisualIDMask, &visual_info_template, &num_visuals);