[gles, wip] reintroducing egl surface (for win32 at first)

examples/triangleGL/build.bat

@@ -1,2 +1,3 @@
 set INCLUDES=/I ..\..\src /I ..\..\src\util /I ..\..\src\platform /I ../../ext
-cl /we4013 /Zi /Zc:preprocessor /DMG_IMPLEMENTS_BACKEND_GL /std:c11 %INCLUDES% main.c /link /LIBPATH:../../bin milepost.lib user32.lib opengl32.lib gdi32.lib /out:test.exe
+
+cl /we4013 /Zi /Zc:preprocessor /DMG_IMPLEMENTS_BACKEND_GL /std:c11 %INCLUDES% main.c /link /LIBPATH:../../bin milepost.lib user32.lib opengl32.lib gdi32.lib shcore.lib /out:../../bin/example_gl_triangle.exe

examples/triangleGL/main.c

@@ -12,6 +12,7 @@
 #define _USE_MATH_DEFINES //NOTE: necessary for MSVC
 #include<math.h>
 
+#define MG_INCLUDE_GL_API
 #include"milepost.h"
 
 #define LOG_SUBSYSTEM "Main"
@@ -67,9 +68,11 @@ int main()
 	mp_window window = mp_window_create(rect, "test", 0);
 
 	//NOTE: create surface
-	mg_surface surface = mg_gl_surface_create_for_window(window);
+	mg_surface surface = mg_surface_create_for_window(window, MG_BACKEND_GL);
 
 	//NOTE: init shader and gl state
+	mg_surface_prepare(surface);
+
 	GLuint vao;
 	glGenVertexArrays(1, &vao);
 	glBindVertexArray(vao);
@@ -123,69 +126,6 @@ int main()
 					mp_request_quit();
 				} break;
 
-				case MP_EVENT_WINDOW_RESIZE:
-				{
-					printf("resized, rect = {%f, %f, %f, %f}\n",
-					       event.frame.rect.x,
-					       event.frame.rect.y,
-					       event.frame.rect.w,
-					       event.frame.rect.h);
-				} break;
-
-				case MP_EVENT_WINDOW_MOVE:
-				{
-					printf("moved, rect = {%f, %f, %f, %f}\n",
-					       event.frame.rect.x,
-					       event.frame.rect.y,
-					       event.frame.rect.w,
-					       event.frame.rect.h);
-				} break;
-
-				case MP_EVENT_MOUSE_MOVE:
-				{
-					printf("mouse moved, pos = {%f, %f}, delta = {%f, %f}\n",
-					       event.move.x,
-					       event.move.y,
-					       event.move.deltaX,
-					       event.move.deltaY);
-				} break;
-
-				case MP_EVENT_MOUSE_WHEEL:
-				{
-					printf("mouse wheel, delta = {%f, %f}\n",
-					       event.move.deltaX,
-					       event.move.deltaY);
-				} break;
-
-				case MP_EVENT_MOUSE_ENTER:
-				{
-					printf("mouse enter\n");
-				} break;
-
-				case MP_EVENT_MOUSE_LEAVE:
-				{
-					printf("mouse leave\n");
-				} break;
-
-				case MP_EVENT_MOUSE_BUTTON:
-				{
-					printf("mouse button %i: %i\n",
-					       event.key.code,
-					       event.key.action == MP_KEY_PRESS ? 1 : 0);
-				} break;
-
-				case MP_EVENT_KEYBOARD_KEY:
-				{
-					printf("key %i: %s\n",
-					        event.key.code,
-					        event.key.action == MP_KEY_PRESS ? "press" : (event.key.action == MP_KEY_RELEASE ? "release" : "repeat"));
-				} break;
-
-				case MP_EVENT_KEYBOARD_CHAR:
-				{
-					printf("entered char %s\n", event.character.sequence);
-				} break;
-
 				default:
 					break;
 			}
@@ -200,8 +140,6 @@ int main()
 		//f32 aspect = frameSize.x/frameSize.y;
 		f32 aspect = 800/(f32)600;
 
-		glViewport(0, 0, 800, 600);
-
    		GLfloat matrix[] = {cosf(alpha)/aspect, sinf(alpha), 0, 0,
     	                  		-sinf(alpha)/aspect, cosf(alpha), 0, 0,
     	                  		0, 0, 1, 0,

examples/triangleGLES/build.bat

@@ -1,2 +1,3 @@
 set INCLUDES=/I ..\..\src /I ..\..\src\util /I ..\..\src\platform /I ../../ext /I ../../ext/angle_headers
-cl /we4013 /Zi /Zc:preprocessor /std:c11 %INCLUDES% main.c /link /LIBPATH:../../bin milepost.lib /LIBPATH:../../bin libEGL.dll.lib libGLESv2.dll.lib user32.lib opengl32.lib gdi32.lib /out:../../bin/example_gles_triangle.exe
+
+cl /we4013 /Zi /Zc:preprocessor /std:c11 %INCLUDES% main.c /link /LIBPATH:../../bin milepost.lib /LIBPATH:../../bin libEGL.dll.lib libGLESv2.dll.lib user32.lib opengl32.lib gdi32.lib shcore.lib /out:../../bin/example_gles_triangle.exe

examples/triangleGLES/main.c

@@ -18,9 +18,6 @@
 
 #define LOG_SUBSYSTEM "Main"
 
-
-mg_surface mg_gles_surface_create_for_window(mp_window window);
-
 unsigned int program;
 
 const char* vshaderSource =
@@ -72,7 +69,7 @@ int main()
 	mp_window window = mp_window_create(rect, "test", 0);
 
 	//NOTE: create surface
-	mg_surface surface = mg_gles_surface_create_for_window(window);
+	mg_surface surface = mg_surface_create_for_window(window, MG_BACKEND_GLES);
 
 	//NOTE: init shader and gl state
 	GLuint vao;
@@ -205,8 +202,6 @@ int main()
 		//f32 aspect = frameSize.x/frameSize.y;
 		f32 aspect = 800/(f32)600;
 
-		glViewport(0, 0, 800, 600);
-
    		GLfloat matrix[] = {cosf(alpha)/aspect, sinf(alpha), 0, 0,
     	                  		-sinf(alpha)/aspect, cosf(alpha), 0, 0,
     	                  		0, 0, 1, 0,

src/egl_surface.c

@@ -0,0 +1,143 @@
+/************************************************************//**
+*
+*	@file: egl_surface.cpp
+*	@author: Martin Fouilleul
+*	@date: 17/02/2023
+*	@revision:
+*
+*****************************************************************/
+
+#define EGL_EGLEXT_PROTOTYPES
+#include<EGL/egl.h>
+#include<EGL/eglext.h>
+
+#include"graphics_internal.h"
+#include"gl_loader.h"
+
+typedef struct mg_egl_surface
+{
+	mg_surface_data interface;
+
+	void* nativeSurface;
+
+	EGLDisplay eglDisplay;
+	EGLConfig eglConfig;
+	EGLContext eglContext;
+	EGLSurface eglSurface;
+
+	mg_gl_api api;
+
+} mg_egl_surface;
+
+#if OS_MACOS
+#include"osx_app.h"
+
+void* mg_egl_get_native_surface(mp_window_data* window)
+{
+	return((void*)window->osx.nsView);
+}
+#elif OS_WIN64
+#include"win32_app.h"
+
+void* mg_egl_get_native_surface(mp_window_data* window)
+{
+	return((void*)window->win32.hWnd);
+}
+#endif
+
+void mg_egl_surface_destroy(mg_surface_data* interface)
+{
+	//////////////////////////////////////////////////
+	//TODO
+	//////////////////////////////////////////////////
+}
+
+void mg_egl_surface_prepare(mg_surface_data* interface)
+{
+	mg_egl_surface* surface = (mg_egl_surface*)interface;
+	eglMakeCurrent(surface->eglDisplay, surface->eglSurface, surface->eglSurface, surface->eglContext);
+	mg_gl_select_api(&surface->api);
+}
+
+void mg_egl_surface_present(mg_surface_data* interface)
+{
+	mg_egl_surface* surface = (mg_egl_surface*)interface;
+	eglSwapBuffers(surface->eglDisplay, surface->eglSurface);
+}
+
+/*
+mp_rect mg_egl_surface_get_frame(mg_surface_data* interface);
+void mg_egl_surface_set_frame(mg_surface_data* interface, mp_rect frame);
+void mg_egl_surface_set_hidden(mg_surface_data* interface, bool hidden);
+bool mg_egl_surface_get_hidden(mg_surface_data* interface);
+*/
+
+mg_surface mg_egl_surface_create_for_window(mp_window window)
+{
+	mg_surface res = mg_surface_nil();
+	mp_window_data* windowData = mp_window_ptr_from_handle(window);
+	if(windowData)
+	{
+		mg_egl_surface* surface = malloc_type(mg_egl_surface);
+		memset(surface, 0, sizeof(mg_egl_surface));
+
+		surface->interface.backend = MG_BACKEND_GLES;
+		surface->interface.destroy = mg_egl_surface_destroy;
+		surface->interface.prepare = mg_egl_surface_prepare;
+		surface->interface.present = mg_egl_surface_present;
+		/*TODO
+		surface->interface.getFrame = mg_egl_surface_get_frame;
+		surface->interface.setFrame = mg_egl_surface_set_frame;
+		surface->interface.getHidden = mg_egl_surface_get_hidden;
+		surface->interface.setHidden = mg_egl_surface_set_hidden;
+		*/
+
+		surface->nativeSurface = mg_egl_get_native_surface(windowData);
+
+		EGLAttrib displayAttribs[] = {
+			EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE,
+	    	EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE,
+	    	EGL_NONE};
+
+		surface->eglDisplay = eglGetPlatformDisplay(EGL_PLATFORM_ANGLE_ANGLE, (void*)EGL_DEFAULT_DISPLAY, displayAttribs);
+		eglInitialize(surface->eglDisplay, NULL, NULL);
+
+		EGLint const configAttributes[] = {
+			EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+			EGL_RED_SIZE, 8,
+			EGL_GREEN_SIZE, 8,
+			EGL_BLUE_SIZE, 8,
+			EGL_ALPHA_SIZE, 8,
+			EGL_DEPTH_SIZE, 24,
+			EGL_STENCIL_SIZE, 8,
+			EGL_SAMPLE_BUFFERS, 0,
+			EGL_SAMPLES, EGL_DONT_CARE,
+			EGL_COLOR_COMPONENT_TYPE_EXT, EGL_COLOR_COMPONENT_TYPE_FIXED_EXT,
+			EGL_NONE };
+
+		int numConfigs = 0;
+		eglChooseConfig(surface->eglDisplay, configAttributes, &surface->eglConfig, 1, &numConfigs);
+
+		EGLint const surfaceAttributes[] = {EGL_NONE};
+		surface->eglSurface = eglCreateWindowSurface(surface->eglDisplay, surface->eglConfig, surface->nativeSurface, surfaceAttributes);
+
+		eglBindAPI(EGL_OPENGL_ES_API);
+		EGLint contextAttributes[] = {
+			EGL_CONTEXT_MAJOR_VERSION_KHR, 3,
+			EGL_CONTEXT_MINOR_VERSION_KHR, 1,
+			EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM, EGL_TRUE,
+			EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE, EGL_TRUE,
+			EGL_CONTEXT_OPENGL_BACKWARDS_COMPATIBLE_ANGLE, EGL_FALSE,
+			EGL_NONE};
+
+		surface->eglContext = eglCreateContext(surface->eglDisplay, surface->eglConfig, EGL_NO_CONTEXT, contextAttributes);
+		eglMakeCurrent(surface->eglDisplay, surface->eglSurface, surface->eglSurface, surface->eglContext);
+
+		mg_gl_load_gles32(&surface->api, (mg_gl_load_proc)eglGetProcAddress);
+
+		eglSwapInterval(surface->eglDisplay, 1);
+
+		res = mg_surface_alloc_handle((mg_surface_data*)surface);
+	}
+	return(res);
+}

src/egl_surface.h

@@ -0,0 +1,17 @@
+/************************************************************//**
+*
+*	@file: egl_surface.h
+*	@author: Martin Fouilleul
+*	@date: 28/01/2023
+*	@revision:
+*
+*****************************************************************/
+#ifndef __EGL_SURFACE_H_
+#define __EGL_SURFACE_H_
+
+#include"graphics.h"
+#include"mp_app.h"
+
+mg_surface mg_egl_surface_create_for_window(mp_window window);
+
+#endif // __EGL_SURFACE_H_

src/gl_loader.c

@@ -5,7 +5,7 @@
 *	@date: 16/022023
 *
 /********************************************************/
-#include"gl_api.h"
+#include"gl_loader.h"
 #include"platform.h"
 
 mp_thread_local mg_gl_api* __mgGLAPI = 0;
@@ -1719,4 +1719,3 @@ void mg_gl_load_gles32(mg_gl_api* api, mg_gl_load_proc loadProc)
 }
 
 void mg_gl_select_api(mg_gl_api* api){ __mgGLAPI = api; }
-

src/glsl_shaders.h

@@ -2,7 +2,7 @@
 *
 *	file: glsl_shaders.h
 *	note: string literals auto-generated by embed_text.py
-*	date: 16/022023
+*	date: 17/022023
 *
 **********************************************************************/
 #ifndef __GLSL_SHADERS_H__

src/graphics.c

@@ -302,6 +302,10 @@ mg_font_data* mg_font_data_from_handle(mg_font font)
 	#endif
 #endif
 
+#if MG_COMPILE_BACKEND_GLES
+	#include"egl_surface.h"
+#endif
+
 #if MG_COMPILE_BACKEND_METAL
 	#include"mtl_surface.h"
 #endif
@@ -361,6 +365,12 @@ mg_surface mg_surface_create_for_window(mp_window window, mg_backend_id backend)
 			break;
 	#endif
 
+	#if MG_COMPILE_BACKEND_GLES
+		case MG_BACKEND_GLES:
+			surface = mg_egl_surface_create_for_window(window);
+			break;
+	#endif
+
 	#if MG_COMPILE_BACKEND_METAL
 		case MG_METAL_BACKEND:
 			surface = mg_mtl_surface_create_for_window(window);

src/graphics.h

@@ -46,6 +46,10 @@ typedef enum {
 		#define MG_COMPILE_BACKEND_GL 1
 	#endif
 
+	#ifndef MG_COMPILE_BACKEND_GLES
+		#define MG_COMPILE_BACKEND_GLES 1
+	#endif
+
 	#if MG_COMPILE_BACKEND_GL
 		#define MG_BACKEND_DEFAULT MG_BACKEND_GL
 	#else

src/milepost.c

@@ -55,10 +55,17 @@
 	#include"win32_app.c"
 	#include"graphics.c"
 
+	#if MG_COMPILE_BACKEND_GL || MG_COMPILE_BACKEND_GLES
+		#include"gl_loader.c"
+	#endif
+
 	#if MG_COMPILE_BACKEND_GL
 		#include"wgl_surface.c"
 		#include"gl_canvas.c"
-		#include"gl_loader.c"
+	#endif
+
+	#if MG_COMPILE_BACKEND_GLES
+		#include"egl_surface.c"
 	#endif
 
 #elif defined(OS_MACOS)

src/milepost.h

@@ -39,7 +39,9 @@
 #include"graphics.h"
 
 #if defined(OS_WIN64)
+	#ifdef MG_INCLUDE_GL_API
 		#include"gl_api.h"
+	#endif
 #endif
 
 //#include"ui.h"

todo.txt

@@ -7,7 +7,8 @@ Overview
 [.] Make backend selection easier
 	[x] rename backend-specific files with api prefix (e.g. egl_, nsgl_, wgl_, mtl_, ...)
 	[x] option macros to select surface/canvas backends to compile into milepost lib
-	[/] option macros to select backend-specific APIs to include when building an app
+	[.] option macros to select backend-specific APIs to include when building an app
+		(ie, include gl_api.h when using gl backend)
 	[x] surface/canvas functions that take a backend id
 	[x] feature-detection functions to know what surface/canvas backends are available at run-time
 	[>] write doc about these options
@@ -17,12 +18,18 @@ Overview
 	[ ] Baked fonts?
 
 [x] Allow different versions of GL/GLES to co-exist
-[!] Keep dummy window/dummy context around for gl context creation, and don't reload wgl functions every time
+[>] Allow selecting version of GL/GLES context when creating surface
+	- pass/set attributes when creating surface?
+
+[/] Keep dummy window/dummy context around for gl context creation, and don't reload wgl functions every time
 
 [>] Reintroduce GLES surface
+[>] Back surface by child windows and implement moving frame/hiding/overlay
+[>] Check that we can make GLES and GL surfaces co-exist in the app
+
 [?] Backport canvas to GLES
 
-[ ] Back surface by child windows and implement moving frame/hiding/overlay
+
 
 [ ] Delegated drawing API+Impl