[PATCH] Android: Port eglretracer for Android

[Alexander Monakov]

I wouldn't recomment abandoning this approach and lifting SurfaceFlinger
interfacing code from Waffle to Apitrace since then you'd have two places with
code that needs fixes and updates (and already at this point it needs fixes
for the multiple-windows problem).  More comments below.

> diff --git a/retrace/glws_waffle.cpp b/retrace/glws_waffle.cpp
> new file mode 100644
> index 0000000..1981dba
> --- /dev/null
> +++ b/retrace/glws_waffle.cpp
> @@ -0,0 +1,229 @@
> +#include "os.hpp"
> +#include "waffle.h"
> +#include "glws.hpp"
> +
> +namespace glws {
> +
> +struct waffle_display *dpy;
> +
> +class WaffleVisual : public Visual
> +{
> +public:
> +    struct waffle_config *config;
> +
> +    WaffleVisual(waffle_config *cfg) :
> +        config (cfg)
> +    {}
> +
> +    ~WaffleVisual() {
> +        if (this->config != NULL)
> +        {
> +            waffle_config_destroy(this->config);
> +            this->config = NULL;
> +        }
> +    }
> +};
> +
> +class WaffleDrawable : public Drawable
> +{
> +public:
> +    struct waffle_window *window;
> +
> +    WaffleDrawable(const Visual *vis, int w, int h, bool pbuffer,
> +        struct waffle_window *win) :
> +        Drawable (vis, w, h, pbuffer),
> +        window (win)
> +    {}
> +
> +    void
> +    resize(int w, int h) {
> +        if (w == width && h == height) {
> +            return;
> +        }
> +
> +        waffle_window_resize(window, w, h);
> +        Drawable::resize(w, h);
> +    }
> +
> +    void
> +    show(void) {
> +        if (visible) {
> +            return;
> +        }
> +
> +        waffle_window_show(window);
> +        Drawable::show();
> +    }
> +
> +    void
> +    swapBuffers(void) {
> +        waffle_window_swap_buffers(window);
> +    }
> +};
> +
> +class WaffleContext : public Context
> +{
> +public:
> +    struct waffle_context *context;
> +
> +    WaffleContext(const Visual *vis, Profile prof,
> +                    struct waffle_context *ctx) :
> +        Context(vis, prof),
> +        context(ctx)
> +    {}
> +
> +    ~WaffleContext() {
> +        if( context != NULL ) {
> +            waffle_context_destroy(context);
> +            context = NULL;
> +        }
> +    }
> +};
> +
> +/*
> + With waffle there is not too many events to look for..
> + */
> +bool
> +processEvents(void) {
> +    return true;
> +}
> +
> +void
> +init(void) {
> +    int i;
> +    int waffle_init_attrib_list[3];
> +
> +    i = 0;
> +    waffle_init_attrib_list[i++] = WAFFLE_PLATFORM;
> +    waffle_init_attrib_list[i++] = WAFFLE_PLATFORM_ANDROID;
> +    waffle_init_attrib_list[i++] = WAFFLE_NONE;
> +
> +    waffle_init(waffle_init_attrib_list);
> +
> +    dpy = waffle_display_connect(NULL);
> +    if (!dpy) {
> +        os::log("No display!!\n");
> +        assert(0);

Apitrace has os::abort() that seems more suitable, but Apitrace is
inconsistent itself and uses assert(0) in many places.  I believe it's better
if new code used os::abort(), but it's not a big deal.  Please also cleanup the
error message.

> +    }
> +}
> +
> +void
> +cleanup(void) {
> +    waffle_display_disconnect(dpy);
> +}
> +
> +Visual *
> +createVisual(bool doubleBuffer, Profile profile) {
> +    struct waffle_config *cfg;
> +    int config_attrib_list[64], i(0);
> +
> +    config_attrib_list[i++] = WAFFLE_CONTEXT_API;
> +
> +    switch (profile) {
> +    case PROFILE_ES1:
> +        if(!waffle_display_supports_context_api(dpy,
> +                                                WAFFLE_CONTEXT_OPENGL_ES1)) {
> +            os::log("%s: !waffle_display_supports_context_api\n",
> +                __FILE__);
> +
> +            assert(0);
> +            return NULL;
> +        }
> +
> +        config_attrib_list[i++] = WAFFLE_CONTEXT_OPENGL_ES1;
> +        break;
> +    case PROFILE_ES2:
> +        if(!waffle_display_supports_context_api(dpy,
> +                                                WAFFLE_CONTEXT_OPENGL_ES2)) {
> +            os::log("%s: !waffle_display_supports_context_api\n",
> +                __FILE__);
> +
> +            assert(0);
> +            return NULL;
> +        }

Please factor out duplicated code.


> +
> +        config_attrib_list[i++] = WAFFLE_CONTEXT_OPENGL_ES2;
> +        break;
> +    default:
> +        os::log("%s: Unsupported context profile\n", __FILE__);
> +        assert(0);
> +        return NULL;
> +    }
> +
> +    config_attrib_list[i++] = WAFFLE_RED_SIZE;
> +    config_attrib_list[i++] = 8;
> +    config_attrib_list[i++] = WAFFLE_GREEN_SIZE;
> +    config_attrib_list[i++] = 8;
> +    config_attrib_list[i++] = WAFFLE_BLUE_SIZE;
> +    config_attrib_list[i++] = 8;
> +    config_attrib_list[i++] = WAFFLE_DEPTH_SIZE;
> +    config_attrib_list[i++] = 8;
> +    config_attrib_list[i++] = WAFFLE_ALPHA_SIZE;
> +    config_attrib_list[i++] = 8;
> +    config_attrib_list[i++] = WAFFLE_STENCIL_SIZE;
> +    config_attrib_list[i++] = 8;
> +    config_attrib_list[i++] = WAFFLE_DOUBLE_BUFFERED;
> +    config_attrib_list[i++] = doubleBuffer;
> +    config_attrib_list[i++] = 0;
> +
> +    cfg = waffle_config_choose(dpy, config_attrib_list);
> +    if (!cfg)
> +    {
> +        os::log("Error in %s waffle_config_choose(dpy, " \
> +            "config_attrib_list)\n", __FILE__);
> +        assert(0);
> +        return NULL;
> +    }
> +
> +    return new WaffleVisual(cfg);
> +}
> +
> +Drawable *
> +createDrawable(const Visual *visual, int width, int height, bool pbuffer)
> +{
> +    struct waffle_window *window;
> +    const WaffleVisual *waffleVisual =
> +        static_cast<const WaffleVisual *>(visual);
> +
> +    window = waffle_window_create(waffleVisual->config, width, height);
> +    return new WaffleDrawable(visual, width, height, pbuffer, window);
> +}
> +
> +Context *
> +createContext(const Visual *visual, Context *shareContext, Profile profile,
> +              bool debug)
> +{
> +    struct waffle_context *context;
> +    const WaffleVisual *waffleVisual =
> +        static_cast<const WaffleVisual *>(visual);
> +
> +    context = waffle_context_create(waffleVisual->config, NULL);
> +    if (!context) {
> +        os::log("Error in %s waffle_context_create(config, NULL)\n",
> +               __FILE__);
> +
> +        assert(0);
> +        return NULL;
> +    }
> +    return new WaffleContext(visual, profile, context);
> +}
> +
> +bool
> +makeCurrent(Drawable *drawable, Context *context)
> +{
> +    if (!drawable || !context) {
> +        return waffle_make_current(dpy, NULL, NULL);
> +    }
> +    else {

"} else {"

The patch looks good to me with those fixes.

Thanks.

Alexander