Total simplification....let matoya fix itself.

Author: dvijayak

GNUmakefile

@@ -24,7 +24,6 @@ OBJS = \
 	src/async.o \
 	src/crypto.o \
 	src/dtls.o \
-	src/error.o \
 	src/file.o \
 	src/hash.o \
 	src/http.o \

makefile

@@ -27,7 +27,6 @@ OBJS = \
 	src\async.obj \
 	src\crypto.obj \
 	src\dtls.obj \
-	src\error.obj \
 	src\file.obj \
 	src\hash.obj \
 	src\http.obj \

src/error.c

@@ -77,17 +77,6 @@ typedef bool (*MTY_MenuItemCheckedFunc)(void *opaque);
 typedef intptr_t (*MTY_WMsgFunc)(MTY_App *app, MTY_Window window, void *hwnd, uint32_t msg,
 	intptr_t wparam, uintptr_t lparam, bool *shouldReturn, void *opaque);
 
-/// @brief Error codes indicating the current state of the platform.
-/// @details Warnings are positive, errors are negative, 0 (::MTY_ERROR_OK) means no error.
-typedef enum {
-	MTY_ERROR_OK                    =  0, ///< No errors.
-	MTY_ERROR_GFX_INVISIBLE_CONTENT =  11, ///< Warning from the gfx driver that rendered content is hidden (for example, when app is in the UAC prompt on Windows)
-	MTY_ERROR_GFX_REVISIBLE_CONTENT =  12, ///< Notice from the gfx driver that rendered content that was hidden is now visible
-	MTY_ERROR_GFX_ERROR             = -11, ///< Generic gfx error
-	MTY_ERROR_GFX_DEVICE_REMOVED    = -21, ///< Generally indicates that the display was unplugged or disabled abruptly
-	MTY_ERROR_MAKE_32               = INT32_MAX,
-} MTY_Error;
-
 /// @brief 3D graphics APIs.
 typedef enum {
 	MTY_GFX_NONE    = 0, ///< No 3D graphics API.
@@ -2628,11 +2617,6 @@ MTY_ThreadDetach(MTY_ThreadFunc func, void *opaque);
 MTY_EXPORT int64_t
 MTY_ThreadGetID(MTY_Thread *ctx);
 
-/// @brief Get the next error code for the given thread.
-/// @param ctx An MTY_Thread.
-MTY_EXPORT MTY_Error
-MTY_ThreadGetError(MTY_Thread *ctx);
-
 /// @brief Create an MTY_Mutex for synchronization.
 /// @details A mutex can be locked by only one thread at a time. Other threads trying
 ///   to take the same mutex will block until it becomes unlocked.

src/error.h

@@ -10,18 +10,7 @@
 
 #include "rwlock.h"
 #include "tlocal.h"
-#include "error.h"
 
-// Thread
-
-MTY_Error MTY_ThreadGetError(MTY_Thread *ctx)
-{
-	// `ctx` is not used since errors are managed via tlocal state
-
-	MTY_Error e = MTY_ERROR_OK;
-	error_local_get_next_error(&e);
-	return e;
-}
 
 // RWLock
 

src/matoya.h

@@ -236,8 +236,3 @@ void mty_metal_ui_destroy(struct gfx_ui **gfx_ui, MTY_Device *device)
 	MTY_Free(ctx);
 	*gfx_ui = NULL;
 }
-
-int32_t mty_metal_ui_get_error(struct gfx_ui *gfx_ui)
-{
-	return 0;
-}

src/thread.c

@@ -12,8 +12,6 @@ GFX_CTX_PROTOTYPES(_d3d11_)
 #include "gfx/sync.h"
 #include "dxgi-sync.h"
 
-#include "d3d11-error.h"
-
 #define DXGI_FATAL(e) ( \
 	(e) == DXGI_ERROR_DEVICE_REMOVED || \
 	(e) == DXGI_ERROR_DRIVER_INTERNAL_ERROR || \
@@ -24,6 +22,7 @@ GFX_CTX_PROTOTYPES(_d3d11_)
 #define D3D11_CTX_WAIT 2000
 
 struct d3d11_ctx {
+	bool ready;
 	HWND hwnd;
 	struct sync sync;
 	struct dxgi_sync *dxgi_sync;
@@ -49,6 +48,8 @@ static void d3d11_ctx_get_size(struct d3d11_ctx *ctx, uint32_t *width, uint32_t
 
 static void d3d11_ctx_free(struct d3d11_ctx *ctx)
 {
+	ctx->ready = false;
+
 	if (ctx->back_buffer)
 		ID3D11RenderTargetView_Release(ctx->back_buffer);
 
@@ -190,12 +191,18 @@ static bool d3d11_ctx_init(struct d3d11_ctx *ctx)
 	if (device2)
 		IDXGIDevice2_Release(device2);
 
-	if (e != S_OK) {
-		d3d11_push_local_error(e);
+	ctx->ready = e == S_OK;
+
+	if (!ctx->ready)
 		d3d11_ctx_free(ctx);
-	}
 
-	return e == S_OK;
+	return ctx->ready;
+}
+
+static bool d3d11_ctx_reinit(struct d3d11_ctx *ctx)
+{
+	d3d11_ctx_free(ctx);
+	return d3d11_ctx_init(ctx);
 }
 
 int32_t mty_d3d11_error_handler_default(int32_t e1, int32_t e2, void *opaque)
@@ -247,18 +254,27 @@ MTY_Device *mty_d3d11_ctx_get_device(struct gfx_ctx *gfx_ctx)
 {
 	struct d3d11_ctx *ctx = (struct d3d11_ctx *) gfx_ctx;
 
+	if (!ctx->ready)
+		d3d11_ctx_reinit(ctx);
+
 	return (MTY_Device *) ctx->device;
 }
 
 MTY_Context *mty_d3d11_ctx_get_context(struct gfx_ctx *gfx_ctx)
 {
 	struct d3d11_ctx *ctx = (struct d3d11_ctx *) gfx_ctx;
 
+	if (!ctx->ready)
+		d3d11_ctx_reinit(ctx);
+
 	return (MTY_Context *) ctx->context;
 }
 
 static void d3d11_ctx_refresh(struct d3d11_ctx *ctx)
 {
+	if (!ctx->ready && !d3d11_ctx_reinit(ctx))
+		return;
+
 	uint32_t width = ctx->width;
 	uint32_t height = ctx->height;
 
@@ -275,10 +291,7 @@ static void d3d11_ctx_refresh(struct d3d11_ctx *ctx)
 
 		if (DXGI_FATAL(e)) {
 			MTY_Log("'IDXGISwapChain2_ResizeBuffers' failed with HRESULT 0x%X", e);
-			d3d11_push_local_error(e);
-
-			d3d11_ctx_free(ctx);
-			d3d11_ctx_init(ctx);
+			ctx->ready = false;
 		}
 	}
 }
@@ -287,6 +300,9 @@ MTY_Surface *mty_d3d11_ctx_get_surface(struct gfx_ctx *gfx_ctx)
 {
 	struct d3d11_ctx *ctx = (struct d3d11_ctx *) gfx_ctx;
 
+	if (!ctx->ready && !d3d11_ctx_reinit(ctx))
+		return NULL;
+
 	HRESULT e = S_OK;
 	ID3D11Resource *resource = NULL;
 
@@ -314,9 +330,7 @@ MTY_Surface *mty_d3d11_ctx_get_surface(struct gfx_ctx *gfx_ctx)
 	if (resource)
 		ID3D11Resource_Release(resource);
 
-	if (e != S_OK)
-		d3d11_push_local_error(e);
-
+	ctx->ready = e == S_OK;
 
 	return (MTY_Surface *) ctx->back_buffer;
 }
@@ -335,6 +349,9 @@ void mty_d3d11_ctx_present(struct gfx_ctx *gfx_ctx)
 {
 	struct d3d11_ctx *ctx = (struct d3d11_ctx *) gfx_ctx;
 
+	if (!ctx->ready && !d3d11_ctx_reinit(ctx))
+		return;
+
 	if (ctx->back_buffer) {
 		int64_t interval = sync_next_interval(&ctx->sync);
 		UINT flags = interval > 0 ? 0 : DXGI_PRESENT_ALLOW_TEARING;
@@ -356,16 +373,13 @@ void mty_d3d11_ctx_present(struct gfx_ctx *gfx_ctx)
 
 		if (DXGI_FATAL(e)) {
 			MTY_Log("'IDXGISwapChain2_Present' failed with HRESULT 0x%X", e);
-			d3d11_push_local_error(e);
-
-			d3d11_ctx_free(ctx);
-			d3d11_ctx_init(ctx);
+			ctx->ready = false;
 
 		} else {
 			DWORD we = WaitForSingleObjectEx(ctx->waitable, D3D11_CTX_WAIT, TRUE);
 			if (we != WAIT_OBJECT_0) {
 				MTY_Log("'WaitForSingleObjectEx' failed with error 0x%X", we);
-				d3d11_push_local_error(e);
+				ctx->ready = false;
 			}
 		}
 	}

src/unix/apple/gfx/metal-ui.m

@@ -17,15 +17,14 @@ static
 static
 #include "shaders/vsui.h"
 
-#include "d3d11-error.h"
-
 struct d3d11_ui_buffer {
 	ID3D11Buffer *b;
 	ID3D11Resource *res;
 	uint32_t len;
 };
 
 struct d3d11_ui {
+	bool ready;
 	struct d3d11_ui_buffer vb;
 	struct d3d11_ui_buffer ib;
 	ID3D11VertexShader *vs;
@@ -151,11 +150,10 @@ struct gfx_ui *mty_d3d11_ui_create(MTY_Device *device)
 
 	except:
 
-	if (e != S_OK) {
-		d3d11_push_local_error(e);
-		mty_d3d11_ui_destroy((struct gfx_ui **) &ctx, device);
-	}
+	ctx->ready = e == S_OK;
 
+	if (!ctx->ready)
+		mty_d3d11_ui_destroy((struct gfx_ui **) &ctx, device);
 
 	return (struct gfx_ui *) ctx;
 }
@@ -201,6 +199,9 @@ bool mty_d3d11_ui_render(struct gfx_ui *gfx_ui, MTY_Device *device, MTY_Context
 	const MTY_DrawData *dd, MTY_Hash *cache, MTY_Surface *dest)
 {
 	struct d3d11_ui *ctx = (struct d3d11_ui *) gfx_ui;
+	if (!ctx->ready)
+		return false;
+
 	ID3D11Device *_device = (ID3D11Device *) device;
 	ID3D11DeviceContext *_context = (ID3D11DeviceContext *) context;
 	ID3D11RenderTargetView *_dest = (ID3D11RenderTargetView *) dest;
@@ -349,8 +350,7 @@ bool mty_d3d11_ui_render(struct gfx_ui *gfx_ui, MTY_Device *device, MTY_Context
 
 	except:
 
-	if (e != S_OK)
-		d3d11_push_local_error(e);
+	ctx->ready = e == S_OK;
 
 	return result;
 }
@@ -408,7 +408,6 @@ void *mty_d3d11_ui_create_texture(struct gfx_ui *gfx_ui, MTY_Device *device, con
 		ID3D11Texture2D_Release(tex);
 
 	if (e != S_OK && srv) {
-		d3d11_push_local_error(e);
 		ID3D11ShaderResourceView_Release(srv);
 		srv = NULL;
 	}