Cleanup

Author: dvijayak

src/app.h

@@ -22,13 +22,6 @@ struct window_common {
 	struct gfx *gfx[APP_GFX_LAYERS];
 	struct gfx_ui *gfx_ui;
 	struct gfx_ctx *gfx_ctx;
-
-	struct window_error_handling {
-		MTY_App *app;
-		MTY_Window window; // TODO THis is SOO ugly, refactor
-		MTY_WindowErrorFunc handler;
-		void *opaque;
-	} error_handling;
 };
 
 // App

src/error.c

@@ -38,8 +38,6 @@ void error_local_push_error(MTY_Error error)
 	if (!Q)
 		return;
 
-	// TODO: Maybe don't push onto queue when error is 0?
-
 	MTY_Error *buf = MTY_QueueGetInputBuffer(Q);
 	if (buf) {
 		*buf = error;

src/gfx/gl/gl-ui.c

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

src/gfx/mod-ctx.h

@@ -14,8 +14,6 @@
 
 struct gfx_ctx;
 
-typedef int32_t (*gfx_error_handler_func)(int32_t e1, int32_t e2, void *opaque);
-
 #define GFX_CTX_PROTO(api, name) mty##api##ctx_##name
 #define GFX_CTX_FP(api, name)    (*name)
 
@@ -29,9 +27,7 @@ typedef int32_t (*gfx_error_handler_func)(int32_t e1, int32_t e2, void *opaque);
 	MTY_Surface *wrap(api, get_surface)(struct gfx_ctx *gfx_ctx); \
 	void wrap(api, set_sync_interval)(struct gfx_ctx *gfx_ctx, uint32_t interval); \
 	bool wrap(api, lock)(struct gfx_ctx *gfx_ctx); \
-	void wrap(api, unlock)(void); \
-	void wrap(api, set_error_handler)(struct gfx_ctx *gfx_ctx, gfx_error_handler_func func, void *opaque); \
-	int32_t wrap(api, get_error)(struct gfx_ctx *gfx_ctx);
+	void wrap(api, unlock)(void);
 
 #define GFX_CTX_PROTOTYPES(api) \
 	GFX_CTX_DECLARE_API(api, GFX_CTX_PROTO)
@@ -48,6 +44,4 @@ typedef int32_t (*gfx_error_handler_func)(int32_t e1, int32_t e2, void *opaque);
 		mty##api##ctx_set_sync_interval, \
 		mty##api##ctx_lock, \
 		mty##api##ctx_unlock, \
-		mty##api##ctx_set_error_handler, \
-		mty##api##ctx_get_error, \
 	},

src/gfx/mod-ui.h

@@ -29,8 +29,7 @@ struct gfx_ui;
 	void *wrap(api, create_texture)(struct gfx_ui *gfx_ui, MTY_Device *device, \
 		const void *rgba, uint32_t width, uint32_t height); \
 	void wrap(api, destroy_texture)(struct gfx_ui *gfx_ui, void **texture, \
-		MTY_Device *device); \
-	int32_t wrap(api, get_error)(struct gfx_ui *gfx_ui);
+		MTY_Device *device);
 
 #define GFX_UI_PROTOTYPES(api) \
 	GFX_UI_DECLARE_API(api, GFX_UI_PROTO)
@@ -42,5 +41,4 @@ struct gfx_ui;
 		mty##api##ui_render, \
 		mty##api##ui_create_texture, \
 		mty##api##ui_destroy_texture, \
-		mty##api##ui_get_error, \
 	},

src/gfx/vk/vk-ctx.c

@@ -720,13 +720,3 @@ bool mty_vk_ctx_lock(struct gfx_ctx *gfx_ctx)
 void mty_vk_ctx_unlock(void)
 {
 }
-
-void mty_vk_ctx_set_error_handler(struct gfx_ctx *gfx_ctx, gfx_error_handler_func func, void *opaque)
-{
-	gfx_ctx; func; opaque;
-}
-
-int32_t mty_vk_ctx_get_error(struct gfx_ctx *gfx_ctx)
-{
-	return 0;
-}

src/gfx/vk/vk-ui.c

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

src/matoya.h

@@ -77,8 +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);
 
-typedef int32_t (*MTY_WindowErrorFunc)(MTY_App *app, MTY_Window window, int32_t error, int32_t internal_error, 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 {
@@ -1075,9 +1073,6 @@ MTY_WindowCreate(MTY_App *app, const char *title, const MTY_Frame *frame, MTY_Wi
 MTY_EXPORT void
 MTY_WindowDestroy(MTY_App *app, MTY_Window window);
 
-MTY_EXPORT void
-MTY_WindowSetErrorHandler(MTY_App *app, MTY_Window window, MTY_WindowErrorFunc func, void *opaque);
-
 /// @brief Get a window's current client area width and height.
 /// @param app The MTY_App.
 /// @param window An MTY_Window.

src/thread.c

@@ -16,7 +16,7 @@
 
 MTY_Error MTY_ThreadGetError(MTY_Thread *ctx)
 {
-	ctx; // not used since errors are managed via tlocal state
+	// `ctx` is not used since errors are managed via tlocal state
 
 	MTY_Error e = MTY_ERROR_OK;
 	error_local_get_next_error(&e);

src/unix/apple/macosx/gfx/metal-ctx.m

@@ -172,13 +172,3 @@ bool mty_metal_ctx_lock(struct gfx_ctx *gfx_ctx)
 void mty_metal_ctx_unlock(void)
 {
 }
-
-void mty_metal_ctx_set_error_handler(struct gfx_ctx *gfx_ctx, gfx_error_handler_func func, void *opaque)
-{
-	gfx_ctx; func; opaque;
-}
-
-int32_t mty_metal_ctx_get_error(struct gfx_ctx *gfx_ctx)
-{
-	return 0;
-}