From 067e00b3dd9b6e122b4517e2852bd52995ea31f0 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Fri, 29 Mar 2013 13:26:07 +0100
Subject: [PATCH] Remove post_render context callback.

Was supposed to be used for overlay, but is useless now.
---
 gfx/context/androidegl_ctx.c | 1 -
 gfx/context/bbqnx_ctx.c      | 1 -
 gfx/context/drm_egl_ctx.c    | 1 -
 gfx/context/glx_ctx.c        | 1 -
 gfx/context/ioseagl_ctx.c    | 1 -
 gfx/context/ps3_ctx.c        | 1 -
 gfx/context/sdl_ctx.c        | 1 -
 gfx/context/vc_egl_ctx.c     | 1 -
 gfx/context/wgl_ctx.c        | 1 -
 gfx/context/xdk_ctx.c        | 1 -
 gfx/context/xegl_ctx.c       | 1 -
 gfx/gfx_context.h            | 4 ----
 gfx/gl.c                     | 4 +---
 13 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c
index 8ad0e45c4d..eb76b8ab8e 100644
--- a/gfx/context/androidegl_ctx.c
+++ b/gfx/context/androidegl_ctx.c
@@ -282,6 +282,5 @@ const gfx_ctx_driver_t gfx_ctx_android = {
    NULL,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "android",
 };
diff --git a/gfx/context/bbqnx_ctx.c b/gfx/context/bbqnx_ctx.c
index 1b32be974f..80c2d0a5f3 100644
--- a/gfx/context/bbqnx_ctx.c
+++ b/gfx/context/bbqnx_ctx.c
@@ -404,6 +404,5 @@ const gfx_ctx_driver_t gfx_ctx_bbqnx = {
    NULL,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "blackberry_qnx",
 };
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/context/drm_egl_ctx.c
index 0fd295240f..2f93a1760f 100644
--- a/gfx/context/drm_egl_ctx.c
+++ b/gfx/context/drm_egl_ctx.c
@@ -629,7 +629,6 @@ const gfx_ctx_driver_t gfx_ctx_drm_egl = {
    gfx_ctx_get_proc_address,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "kms-egl",
 };
 
diff --git a/gfx/context/glx_ctx.c b/gfx/context/glx_ctx.c
index 6032d79566..116400ba96 100644
--- a/gfx/context/glx_ctx.c
+++ b/gfx/context/glx_ctx.c
@@ -522,7 +522,6 @@ const gfx_ctx_driver_t gfx_ctx_glx = {
    gfx_ctx_get_proc_address,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "glx",
 };
 
diff --git a/gfx/context/ioseagl_ctx.c b/gfx/context/ioseagl_ctx.c
index 1932e1e9d4..4b8515e462 100644
--- a/gfx/context/ioseagl_ctx.c
+++ b/gfx/context/ioseagl_ctx.c
@@ -136,6 +136,5 @@ const gfx_ctx_driver_t gfx_ctx_ios = {
    NULL,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "ios",
 };
diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index a5a34e324b..74d38285af 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -430,7 +430,6 @@ const gfx_ctx_driver_t gfx_ctx_ps3 = {
    NULL,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "ps3",
 #ifdef HAVE_RMENU
    gfx_ctx_get_available_resolutions,
diff --git a/gfx/context/sdl_ctx.c b/gfx/context/sdl_ctx.c
index 1c052c873a..a04d85c33b 100644
--- a/gfx/context/sdl_ctx.c
+++ b/gfx/context/sdl_ctx.c
@@ -371,7 +371,6 @@ const gfx_ctx_driver_t gfx_ctx_sdl_gl = {
    gfx_ctx_get_proc_address,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "sdl-gl",
 };
 
diff --git a/gfx/context/vc_egl_ctx.c b/gfx/context/vc_egl_ctx.c
index 5ab7f1ebbc..48d1e82c7c 100644
--- a/gfx/context/vc_egl_ctx.c
+++ b/gfx/context/vc_egl_ctx.c
@@ -480,6 +480,5 @@ const gfx_ctx_driver_t gfx_ctx_videocore = {
    gfx_ctx_get_proc_address,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "videocore",
 };
diff --git a/gfx/context/wgl_ctx.c b/gfx/context/wgl_ctx.c
index 16e3353e5c..43d3646e10 100644
--- a/gfx/context/wgl_ctx.c
+++ b/gfx/context/wgl_ctx.c
@@ -456,7 +456,6 @@ const gfx_ctx_driver_t gfx_ctx_wgl = {
    gfx_ctx_get_proc_address,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "wgl",
 };
 
diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c
index 714a02123b..37d5ea0f94 100644
--- a/gfx/context/xdk_ctx.c
+++ b/gfx/context/xdk_ctx.c
@@ -395,7 +395,6 @@ const gfx_ctx_driver_t gfx_ctx_xdk = {
    NULL,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "xdk",
 #if defined(HAVE_RMENU)
    gfx_ctx_xdk_get_available_resolutions,
diff --git a/gfx/context/xegl_ctx.c b/gfx/context/xegl_ctx.c
index bea4ce2fa2..cb86825fb2 100644
--- a/gfx/context/xegl_ctx.c
+++ b/gfx/context/xegl_ctx.c
@@ -565,7 +565,6 @@ const gfx_ctx_driver_t gfx_ctx_x_egl = {
    gfx_ctx_get_proc_address,
    gfx_ctx_init_egl_image_buffer,
    gfx_ctx_write_egl_image,
-   NULL,
    "x-egl",
 };
 
diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h
index 5f66342239..6b9fb7d176 100644
--- a/gfx/gfx_context.h
+++ b/gfx/gfx_context.h
@@ -110,10 +110,6 @@ typedef struct gfx_ctx_driver
    // Always returns true the first time it's called for a new index. The graphics core must handle a change in the handle correctly.
    bool (*write_egl_image)(const void *frame, unsigned width, unsigned height, unsigned pitch, bool rgb32, unsigned index, void **image_handle);
 
-   // Called after frame is rendered, but before swap.
-   // Can be used to render context-specific overlays and stuff.
-   bool (*post_render)(void *gl);
-
    // Human readable string.
    const char *ident;
 
diff --git a/gfx/gl.c b/gfx/gl.c
index 20a8fa5d82..4ea379db22 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1431,10 +1431,8 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
    if (msg && gl->font_ctx)
       gl->font_ctx->render_msg(gl, msg, NULL);
 
-   if (gl->ctx_driver->post_render)
-      context_post_render_func(gl);
 #ifdef HAVE_OVERLAY
-   else if (gl->overlay_enable)
+   if (gl->overlay_enable)
       gl_render_overlay(gl);
 #endif