YaGL: implement textures enabling/disabling with glEnable/glDisable

Currently this is not used in any way. Android openGL uses this information for
implementing  OES_draw_texture extension API functions glDrawTex*OES(), which
we do not support.

Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>

diff --git a/hw/yagl_apis/gles/yagl_gles_context.c b/hw/yagl_apis/gles/yagl_gles_context.c
index 9a87e7e..b3ea14f 100644 (file)
--- a/hw/yagl_apis/gles/yagl_gles_context.c
+++ b/hw/yagl_apis/gles/yagl_gles_context.c
@@ -387,6 +387,17 @@ struct yagl_gles_texture_target_state
     return &yagl_gles_context_get_active_texture_unit(ctx)->target_states[texture_target];
 }
 
+void yagl_gles_context_active_texture_set_enabled(struct yagl_gles_context *ctx,
+               yagl_gles_texture_target texture_target, bool enabled)
+{
+    struct yagl_gles_texture_target_state *texture_target_state;
+
+    texture_target_state =
+            yagl_gles_context_get_active_texture_target_state(ctx,
+                                                              texture_target);
+    texture_target_state->enabled = enabled;
+}
+
 void yagl_gles_context_bind_texture(struct yagl_gles_context *ctx,
                                     yagl_gles_texture_target texture_target,
                                     struct yagl_gles_texture *texture,

diff --git a/hw/yagl_apis/gles/yagl_gles_context.h b/hw/yagl_apis/gles/yagl_gles_context.h
index 1c2cffb..146c2c4 100644 (file)
--- a/hw/yagl_apis/gles/yagl_gles_context.h
+++ b/hw/yagl_apis/gles/yagl_gles_context.h
@@ -160,6 +160,9 @@ struct yagl_gles_texture_target_state
     *yagl_gles_context_get_active_texture_target_state(struct yagl_gles_context *ctx,
                                                        yagl_gles_texture_target texture_target);
 
+void yagl_gles_context_active_texture_set_enabled(struct yagl_gles_context *ctx,
+               yagl_gles_texture_target texture_target, bool enabled);
+
 void yagl_gles_context_bind_texture(struct yagl_gles_context *ctx,
                                     yagl_gles_texture_target texture_target,
                                     struct yagl_gles_texture *texture,

diff --git a/hw/yagl_apis/gles/yagl_gles_texture_unit.h b/hw/yagl_apis/gles/yagl_gles_texture_unit.h
index 037cdb5..c683a37 100644 (file)
--- a/hw/yagl_apis/gles/yagl_gles_texture_unit.h
+++ b/hw/yagl_apis/gles/yagl_gles_texture_unit.h
@@ -13,7 +13,7 @@ struct yagl_gles_texture_target_state
 
     /*
      * For GLESv1 only. In GLESv2 2D texture and cubemap textures cannot be
-     * enabled/disabled.
+     * enabled/disabled. Currently not used.
      */
     bool enabled;
 };

diff --git a/hw/yagl_apis/gles/yagl_host_gles_calls.c b/hw/yagl_apis/gles/yagl_host_gles_calls.c
index 18ac715..9731caf 100644 (file)
--- a/hw/yagl_apis/gles/yagl_host_gles_calls.c
+++ b/hw/yagl_apis/gles/yagl_host_gles_calls.c
@@ -683,10 +683,15 @@ bool yagl_host_glDepthRangef(GLclampf zNear,
 
 bool yagl_host_glDisable(GLenum cap)
 {
-    YAGL_GET_CTX(glEnable);
+    YAGL_GET_CTX(glDisable);
 
     ctx->driver->Disable(cap);
 
+    if (cap == GL_TEXTURE_2D) {
+        yagl_gles_context_active_texture_set_enabled(ctx,
+            yagl_gles_texture_target_2d, false);
+    }
+
     return true;
 }
 
@@ -829,6 +834,11 @@ bool yagl_host_glEnable(GLenum cap)
 
     ctx->driver->Enable(cap);
 
+    if (cap == GL_TEXTURE_2D) {
+        yagl_gles_context_active_texture_set_enabled(ctx,
+            yagl_gles_texture_target_2d, true);
+    }
+
     return true;
 }