YaGL: Removed what's left of pipeline stuff, we don't use it anymore

diff --git a/hw/yagl_apis/egl/yagl_host_egl_calls.c b/hw/yagl_apis/egl/yagl_host_egl_calls.c
index 8b5b96f..2e9fa4e 100644 (file)
--- a/hw/yagl_apis/egl/yagl_host_egl_calls.c
+++ b/hw/yagl_apis/egl/yagl_host_egl_calls.c
@@ -319,8 +319,6 @@ EGLBoolean yagl_host_eglInitialize(yagl_host_handle dpy_,
 
     YAGL_LOG_FUNC_SET_TS(egl_api_ts->ts, eglInitialize);
 
-    YAGL_BARRIER_ARG(egl_api_ts->ts);
-
     dpy = yagl_egl_api_ps_display_get(egl_api_ts->api_ps, dpy_);
 
     if (!dpy) {
@@ -330,10 +328,6 @@ EGLBoolean yagl_host_eglInitialize(yagl_host_handle dpy_,
 
     yagl_egl_display_initialize(dpy);
 
-    if (!YAGL_BARRIER_RET(egl_api_ts->ts)) {
-        return EGL_FALSE;
-    }
-
     if (major) {
         yagl_mem_put_EGLint(egl_api_ts->ts, major, YAGL_EGL_VERSION_MAJOR);
     }
@@ -1033,8 +1027,6 @@ yagl_host_handle yagl_host_eglCreateContext(yagl_host_handle dpy_,
         }
     }
 
-    YAGL_BARRIER_ARG(egl_api_ts->ts);
-
     if (!yagl_validate_display(dpy_, &dpy)) {
         goto out;
     }
@@ -1151,8 +1143,6 @@ EGLBoolean yagl_host_eglMakeCurrent(yagl_host_handle dpy_,
 
     YAGL_LOG_FUNC_SET_TS(egl_api_ts->ts, eglMakeCurrent);
 
-    YAGL_BARRIER_ARG(egl_api_ts->ts);
-
     if (bad_match) {
         YAGL_SET_ERR(EGL_BAD_MATCH);
         goto out;
@@ -1319,8 +1309,6 @@ EGLBoolean yagl_host_eglSwapBuffers(yagl_host_handle dpy_,
 
     YAGL_LOG_FUNC_SET_TS(egl_api_ts->ts, eglSwapBuffers);
 
-    YAGL_BARRIER_ARG(egl_api_ts->ts);
-
     if (!yagl_validate_display(dpy_, &dpy)) {
         goto out;
     }
@@ -1351,10 +1339,6 @@ EGLBoolean yagl_host_eglSwapBuffers(yagl_host_handle dpy_,
         goto out;
     }
 
-    if (!YAGL_BARRIER_RET(egl_api_ts->ts)) {
-        goto out;
-    }
-
     yagl_egl_surface_lock(surface);
 
     if (surface->bimage_ct) {
@@ -1420,8 +1404,6 @@ yagl_host_handle yagl_host_eglCreateWindowSurfaceOffscreenYAGL(yagl_host_handle
         goto out;
     }
 
-    YAGL_BARRIER_ARG(egl_api_ts->ts);
-
     yagl_egl_window_attribs_init(&attribs);
 
     if (!yagl_egl_is_attrib_list_empty(attrib_list)) {
@@ -1548,8 +1530,6 @@ EGLBoolean yagl_host_eglResizeOffscreenSurfaceYAGL(yagl_host_handle dpy_,
         goto out;
     }
 
-    YAGL_BARRIER_ARG(egl_api_ts->ts);
-
     native_sfc = egl_api_ts->driver_ps->pbuffer_surface_create(egl_api_ts->driver_ps,
                                                                dpy->native_dpy,
                                                                &surface->cfg->native,

diff --git a/hw/yagl_apis/gles/yagl_host_gles_calls.c b/hw/yagl_apis/gles/yagl_host_gles_calls.c
index 20ebad0..08bcc38 100644 (file)
--- a/hw/yagl_apis/gles/yagl_host_gles_calls.c
+++ b/hw/yagl_apis/gles/yagl_host_gles_calls.c
@@ -143,8 +143,6 @@ void yagl_host_glActiveTexture(GLenum texture)
 {
     YAGL_GET_CTX(glActiveTexture);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     if (!yagl_gles_context_set_active_texture(ctx, texture)) {
         YAGL_SET_ERR(GL_INVALID_ENUM);
     }
@@ -158,8 +156,6 @@ void yagl_host_glBindBuffer(GLenum target,
 
     YAGL_GET_CTX(glBindBuffer);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     if (buffer != 0) {
         buffer_obj = (struct yagl_gles_buffer*)yagl_sharegroup_acquire_object(ctx->base.sg,
             YAGL_NS_BUFFER, buffer);
@@ -193,8 +189,6 @@ void yagl_host_glBindTexture(GLenum target,
 
     YAGL_GET_CTX(glBindTexture);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     if (!yagl_gles_validate_texture_target(target, &texture_target)) {
         YAGL_SET_ERR(GL_INVALID_ENUM);
         goto out;
@@ -234,8 +228,6 @@ void yagl_host_glBlendFunc(GLenum sfactor,
 {
     YAGL_GET_CTX(glBlendFunc);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->BlendFunc(ctx->driver_ps, sfactor, dfactor);
 }
 
@@ -282,8 +274,6 @@ void yagl_host_glBufferData(GLenum target,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     yagl_gles_buffer_set_data(buffer_obj, size, data, usage);
 
 out:
@@ -331,8 +321,6 @@ void yagl_host_glBufferSubData(GLenum target,
         goto out;
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     if (!yagl_gles_buffer_update_data(buffer_obj, offset, size, data)) {
         YAGL_SET_ERR(GL_INVALID_VALUE);
         goto out;
@@ -347,8 +335,6 @@ void yagl_host_glClear(GLbitfield mask)
 {
     YAGL_GET_CTX(glClear);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Clear(ctx->driver_ps, mask);
 }
 
@@ -359,8 +345,6 @@ void yagl_host_glClearColor(GLclampf red,
 {
     YAGL_GET_CTX(glClearColor);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->ClearColor(ctx->driver_ps, red, green, blue, alpha);
 }
 
@@ -368,8 +352,6 @@ void yagl_host_glClearDepthf(GLclampf depth)
 {
     YAGL_GET_CTX(glClearDepthf);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->ClearDepthf(ctx->driver_ps, depth);
 }
 
@@ -377,8 +359,6 @@ void yagl_host_glClearStencil(GLint s)
 {
     YAGL_GET_CTX(glClearStencil);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->ClearStencil(ctx->driver_ps, s);
 }
 
@@ -389,8 +369,6 @@ void yagl_host_glColorMask(GLboolean red,
 {
     YAGL_GET_CTX(glColorMask);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->ColorMask(ctx->driver_ps, red, green, blue, alpha);
 }
 
@@ -418,8 +396,6 @@ void yagl_host_glCompressedTexImage2D(GLenum target,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->CompressedTexImage2D(ctx->driver_ps,
                                          target,
                                          level,
@@ -459,8 +435,6 @@ void yagl_host_glCompressedTexSubImage2D(GLenum target,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->CompressedTexSubImage2D(ctx->driver_ps,
                                             target,
                                             level,
@@ -487,8 +461,6 @@ void yagl_host_glCopyTexImage2D(GLenum target,
 {
     YAGL_GET_CTX(glCopyTexImage2D);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->CopyTexImage2D(ctx->driver_ps,
                                    target,
                                    level,
@@ -511,8 +483,6 @@ void yagl_host_glCopyTexSubImage2D(GLenum target,
 {
     YAGL_GET_CTX(glCopyTexSubImage2D);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->CopyTexSubImage2D(ctx->driver_ps,
                                       target,
                                       level,
@@ -528,8 +498,6 @@ void yagl_host_glCullFace(GLenum mode)
 {
     YAGL_GET_CTX(glCullFace);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->CullFace(ctx->driver_ps, mode);
 }
 
@@ -559,8 +527,6 @@ void yagl_host_glDeleteBuffers(GLsizei n,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     if (buffer_names) {
         for (i = 0; i < n; ++i) {
             buffer_obj = (struct yagl_gles_buffer*)yagl_sharegroup_acquire_object(ctx->base.sg,
@@ -607,8 +573,6 @@ void yagl_host_glDeleteTextures(GLsizei n,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     if (texture_names) {
         for (i = 0; i < n; ++i) {
             yagl_gles_context_unbind_texture(ctx, texture_names[i]);
@@ -628,8 +592,6 @@ void yagl_host_glDepthFunc(GLenum func)
 {
     YAGL_GET_CTX(glDepthFunc);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->DepthFunc(ctx->driver_ps, func);
 }
 
@@ -637,8 +599,6 @@ void yagl_host_glDepthMask(GLboolean flag)
 {
     YAGL_GET_CTX(glDepthMask);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->DepthMask(ctx->driver_ps, flag);
 }
 
@@ -647,8 +607,6 @@ void yagl_host_glDepthRangef(GLclampf zNear,
 {
     YAGL_GET_CTX(glDepthRangef);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->DepthRangef(ctx->driver_ps, zNear, zFar);
 }
 
@@ -656,8 +614,6 @@ void yagl_host_glDisable(GLenum cap)
 {
     YAGL_GET_CTX(glEnable);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Disable(ctx->driver_ps, cap);
 }
 
@@ -681,8 +637,6 @@ void yagl_host_glDrawArrays(GLenum mode,
         return;
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->DrawArrays(ctx->driver_ps, mode, first, count);
 }
 
@@ -772,8 +726,6 @@ void yagl_host_glDrawElements(GLenum mode,
         goto out;
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->DrawElements(ctx->driver_ps,
                                  mode,
                                  count,
@@ -793,8 +745,6 @@ void yagl_host_glEnable(GLenum cap)
 {
     YAGL_GET_CTX(glEnable);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Enable(ctx->driver_ps, cap);
 }
 
@@ -802,8 +752,6 @@ void yagl_host_glFinish(void)
 {
     YAGL_GET_CTX(glFinish);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Finish(ctx->driver_ps);
 }
 
@@ -811,8 +759,6 @@ void yagl_host_glFlush(void)
 {
     YAGL_GET_CTX(glFlush);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Flush(ctx->driver_ps);
 }
 
@@ -820,8 +766,6 @@ void yagl_host_glFrontFace(GLenum mode)
 {
     YAGL_GET_CTX(glFrontFace);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->FrontFace(ctx->driver_ps, mode);
 }
 
@@ -1059,8 +1003,6 @@ void yagl_host_glHint(GLenum target,
 {
     YAGL_GET_CTX(glHint);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Hint(ctx->driver_ps, target, mode);
 }
 
@@ -1084,8 +1026,6 @@ void yagl_host_glLineWidth(GLfloat width)
 {
     YAGL_GET_CTX(glLineWidth);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->LineWidth(ctx->driver_ps, width);
 }
 
@@ -1094,8 +1034,6 @@ void yagl_host_glPixelStorei(GLenum pname,
 {
     YAGL_GET_CTX(glPixelStorei);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->PixelStorei(ctx->driver_ps, pname, param);
 }
 
@@ -1104,8 +1042,6 @@ void yagl_host_glPolygonOffset(GLfloat factor,
 {
     YAGL_GET_CTX(glPolygonOffset);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->PolygonOffset(ctx->driver_ps, factor, units);
 }
 
@@ -1125,8 +1061,6 @@ void yagl_host_glSampleCoverage(GLclampf value,
 {
     YAGL_GET_CTX(glSampleCoverage);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->SampleCoverage(ctx->driver_ps, value, invert);
 }
 
@@ -1137,8 +1071,6 @@ void yagl_host_glScissor(GLint x,
 {
     YAGL_GET_CTX(glScissor);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Scissor(ctx->driver_ps, x, y, width, height);
 }
 
@@ -1148,8 +1080,6 @@ void yagl_host_glStencilFunc(GLenum func,
 {
     YAGL_GET_CTX(glStencilFunc);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->StencilFunc(ctx->driver_ps, func, ref, mask);
 }
 
@@ -1157,8 +1087,6 @@ void yagl_host_glStencilMask(GLuint mask)
 {
     YAGL_GET_CTX(glStencilMask);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->StencilMask(ctx->driver_ps, mask);
 }
 
@@ -1168,8 +1096,6 @@ void yagl_host_glStencilOp(GLenum fail,
 {
     YAGL_GET_CTX(glStencilOp);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->StencilOp(ctx->driver_ps, fail, zfail, zpass);
 }
 
@@ -1208,8 +1134,6 @@ void yagl_host_glTexImage2D(GLenum target,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->TexImage2D(ctx->driver_ps,
                                target,
                                level,
@@ -1231,8 +1155,6 @@ void yagl_host_glTexParameterf(GLenum target,
 {
     YAGL_GET_CTX(glTexParameterf);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->TexParameterf(ctx->driver_ps, target, pname, param);
 }
 
@@ -1249,8 +1171,6 @@ void yagl_host_glTexParameteri(GLenum target,
 {
     YAGL_GET_CTX(glTexParameteri);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->TexParameteri(ctx->driver_ps, target, pname, param);
 }
 
@@ -1296,8 +1216,6 @@ void yagl_host_glTexSubImage2D(GLenum target,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->TexSubImage2D(ctx->driver_ps,
                                   target,
                                   level,
@@ -1320,7 +1238,5 @@ void yagl_host_glViewport(GLint x,
 {
     YAGL_GET_CTX(glViewport);
 
-    YAGL_BARRIER_ARG_NORET(ts);
-
     ctx->driver_ps->Viewport(ctx->driver_ps, x, y, width, height);
 }

diff --git a/hw/yagl_apis/gles2/yagl_host_gles2_calls.c b/hw/yagl_apis/gles2/yagl_host_gles2_calls.c
index 54dee74..2c1cad1 100644 (file)
--- a/hw/yagl_apis/gles2/yagl_host_gles2_calls.c
+++ b/hw/yagl_apis/gles2/yagl_host_gles2_calls.c
@@ -182,8 +182,6 @@ void yagl_host_glAttachShader(GLuint program,
 
     YAGL_GET_CTX(glAttachShader);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     program_obj = (struct yagl_gles2_program*)yagl_sharegroup_acquire_object(ctx->sg,
         YAGL_NS_PROGRAM, program);
 
@@ -236,8 +234,6 @@ void yagl_host_glBindAttribLocation(GLuint program,
         YAGL_LOG_TRACE("binding attrib %s location to %d", name, index);
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     yagl_gles2_program_bind_attrib_location(program_obj, index, name);
 
 out:
@@ -252,8 +248,6 @@ void yagl_host_glBindFramebuffer(GLenum target,
 
     YAGL_GET_CTX(glBindFramebuffer);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     if (framebuffer != 0) {
         framebuffer_obj = (struct yagl_gles_framebuffer*)yagl_sharegroup_acquire_object(ctx->sg,
             YAGL_NS_FRAMEBUFFER, framebuffer);
@@ -290,8 +284,6 @@ void yagl_host_glBindRenderbuffer(GLenum target,
 
     YAGL_GET_CTX(glBindRenderbuffer);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     if (renderbuffer != 0) {
         renderbuffer_obj = (struct yagl_gles_renderbuffer*)yagl_sharegroup_acquire_object(ctx->sg,
             YAGL_NS_RENDERBUFFER, renderbuffer);
@@ -328,8 +320,6 @@ void yagl_host_glBlendColor(GLclampf red,
 {
     YAGL_GET_CTX(glBlendColor);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->BlendColor(ctx->driver_ps, red, green, blue, alpha);
 }
 
@@ -337,8 +327,6 @@ void yagl_host_glBlendEquation(GLenum mode)
 {
     YAGL_GET_CTX(glBlendEquation);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->BlendEquation(ctx->driver_ps, mode);
 }
 
@@ -347,8 +335,6 @@ void yagl_host_glBlendEquationSeparate(GLenum modeRGB,
 {
     YAGL_GET_CTX(glBlendEquationSeparate);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->BlendEquationSeparate(ctx->driver_ps, modeRGB, modeAlpha);
 }
 
@@ -359,8 +345,6 @@ void yagl_host_glBlendFuncSeparate(GLenum srcRGB,
 {
     YAGL_GET_CTX(glBlendFuncSeparate);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->BlendFuncSeparate(ctx->driver_ps,
                                       srcRGB,
                                       dstRGB,
@@ -381,8 +365,6 @@ void yagl_host_glCompileShader(GLuint shader)
 
     YAGL_GET_CTX(glCompileShader);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     shader_obj = (struct yagl_gles2_shader*)yagl_sharegroup_acquire_object(ctx->sg,
         YAGL_NS_SHADER, shader);
 
@@ -465,8 +447,6 @@ void yagl_host_glDeleteFramebuffers(GLsizei n,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     if (framebuffer_names) {
         for (i = 0; i < n; ++i) {
             yagl_gles_context_unbind_framebuffer(&ctx->base, framebuffer_names[i]);
@@ -485,8 +465,6 @@ void yagl_host_glDeleteProgram(GLuint program)
 {
     YAGL_GET_CTX(glDeleteProgram);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     yagl_gles2_context_unuse_program(ctx, program);
 
     yagl_sharegroup_remove(ctx->sg,
@@ -519,8 +497,6 @@ void yagl_host_glDeleteRenderbuffers(GLsizei n,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     if (renderbuffer_names) {
         for (i = 0; i < n; ++i) {
             yagl_gles_context_unbind_renderbuffer(&ctx->base, renderbuffer_names[i]);
@@ -539,8 +515,6 @@ void yagl_host_glDeleteShader(GLuint shader)
 {
     YAGL_GET_CTX(glDeleteShader);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     yagl_sharegroup_remove(ctx->sg,
                            YAGL_NS_SHADER,
                            shader);
@@ -554,8 +528,6 @@ void yagl_host_glDetachShader(GLuint program,
 
     YAGL_GET_CTX(glDetachShader);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     program_obj = (struct yagl_gles2_program*)yagl_sharegroup_acquire_object(ctx->sg,
         YAGL_NS_PROGRAM, program);
 
@@ -588,8 +560,6 @@ void yagl_host_glDisableVertexAttribArray(GLuint index)
 
     YAGL_GET_CTX(glDisableVertexAttribArray);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     array = yagl_gles_context_get_array(&ctx->base, index);
 
     if (!array) {
@@ -608,8 +578,6 @@ void yagl_host_glEnableVertexAttribArray(GLuint index)
 
     YAGL_GET_CTX(glEnableVertexAttribArray);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     array = yagl_gles_context_get_array(&ctx->base, index);
 
     if (!array) {
@@ -632,8 +600,6 @@ void yagl_host_glFramebufferRenderbuffer(GLenum target,
 
     YAGL_GET_CTX(glFramebufferRenderbuffer);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     framebuffer_obj = yagl_gles_context_acquire_binded_framebuffer(&ctx->base, target);
 
     if (!framebuffer_obj) {
@@ -677,8 +643,6 @@ void yagl_host_glFramebufferTexture2D(GLenum target,
 
     YAGL_GET_CTX(glFramebufferTexture2D);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     framebuffer_obj = yagl_gles_context_acquire_binded_framebuffer(&ctx->base, target);
 
     if (!framebuffer_obj) {
@@ -716,8 +680,6 @@ void yagl_host_glGenerateMipmap(GLenum target)
 {
     YAGL_GET_CTX(glGenerateMipmap);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->common->GenerateMipmap(ctx->driver_ps->common, target);
 }
 
@@ -1181,8 +1143,6 @@ void yagl_host_glLinkProgram(GLuint program)
 
     YAGL_GET_CTX(glLinkProgram);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     program_obj = (struct yagl_gles2_program*)yagl_sharegroup_acquire_object(ctx->sg,
         YAGL_NS_PROGRAM, program);
 
@@ -1201,8 +1161,6 @@ void yagl_host_glReleaseShaderCompiler(void)
 {
     YAGL_GET_CTX(glReleaseShaderCompiler);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->ReleaseShaderCompiler(ctx->driver_ps);
 }
 
@@ -1213,8 +1171,6 @@ void yagl_host_glRenderbufferStorage(GLenum target,
 {
     YAGL_GET_CTX(glRenderbufferStorage);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->common->RenderbufferStorage(ctx->driver_ps->common,
                                                 target,
                                                 internalformat,
@@ -1298,8 +1254,6 @@ void yagl_host_glShaderSource(GLuint shader,
         YAGL_LOG_TRACE("string %d = %s", i, tmp);
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     yagl_gles2_shader_source(shader_obj,
                              strings,
                              count,
@@ -1324,8 +1278,6 @@ void yagl_host_glStencilFuncSeparate(GLenum face,
 {
     YAGL_GET_CTX(glStencilFuncSeparate);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->StencilFuncSeparate(ctx->driver_ps, face, func, ref, mask);
 }
 
@@ -1334,8 +1286,6 @@ void yagl_host_glStencilMaskSeparate(GLenum face,
 {
     YAGL_GET_CTX(glStencilMaskSeparate);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->StencilMaskSeparate(ctx->driver_ps, face, mask);
 }
 
@@ -1346,8 +1296,6 @@ void yagl_host_glStencilOpSeparate(GLenum face,
 {
     YAGL_GET_CTX(glStencilOpSeparate);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->StencilOpSeparate(ctx->driver_ps, face, fail, zfail, zpass);
 }
 
@@ -1356,8 +1304,6 @@ void yagl_host_glUniform1f(GLint location,
 {
     YAGL_GET_CTX(glUniform1f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform1f(ctx->driver_ps, location, x);
 }
 
@@ -1380,8 +1326,6 @@ void yagl_host_glUniform1fv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform1fv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1393,8 +1337,6 @@ void yagl_host_glUniform1i(GLint location,
 {
     YAGL_GET_CTX(glUniform1i);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform1i(ctx->driver_ps, location, x);
 }
 
@@ -1417,8 +1359,6 @@ void yagl_host_glUniform1iv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform1iv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1431,8 +1371,6 @@ void yagl_host_glUniform2f(GLint location,
 {
     YAGL_GET_CTX(glUniform2f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform2f(ctx->driver_ps, location, x, y);
 }
 
@@ -1455,8 +1393,6 @@ void yagl_host_glUniform2fv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform2fv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1469,8 +1405,6 @@ void yagl_host_glUniform2i(GLint location,
 {
     YAGL_GET_CTX(glUniform2i);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform2i(ctx->driver_ps, location, x, y);
 }
 
@@ -1493,8 +1427,6 @@ void yagl_host_glUniform2iv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform2iv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1508,8 +1440,6 @@ void yagl_host_glUniform3f(GLint location,
 {
     YAGL_GET_CTX(glUniform3f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform3f(ctx->driver_ps, location, x, y, z);
 }
 
@@ -1532,8 +1462,6 @@ void yagl_host_glUniform3fv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform3fv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1547,8 +1475,6 @@ void yagl_host_glUniform3i(GLint location,
 {
     YAGL_GET_CTX(glUniform3i);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform3i(ctx->driver_ps, location, x, y, z);
 }
 
@@ -1571,8 +1497,6 @@ void yagl_host_glUniform3iv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform3iv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1587,8 +1511,6 @@ void yagl_host_glUniform4f(GLint location,
 {
     YAGL_GET_CTX(glUniform4f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform4f(ctx->driver_ps, location, x, y, z, w);
 }
 
@@ -1611,8 +1533,6 @@ void yagl_host_glUniform4fv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform4fv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1627,8 +1547,6 @@ void yagl_host_glUniform4i(GLint location,
 {
     YAGL_GET_CTX(glUniform4i);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform4i(ctx->driver_ps, location, x, y, z, w);
 }
 
@@ -1651,8 +1569,6 @@ void yagl_host_glUniform4iv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->Uniform4iv(ctx->driver_ps, location, count, v);
 
 out:
@@ -1679,8 +1595,6 @@ void yagl_host_glUniformMatrix2fv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->UniformMatrix2fv(ctx->driver_ps, location, count, transpose, value);
 
 out:
@@ -1707,8 +1621,6 @@ void yagl_host_glUniformMatrix3fv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->UniformMatrix3fv(ctx->driver_ps, location, count, transpose, value);
 
 out:
@@ -1735,8 +1647,6 @@ void yagl_host_glUniformMatrix4fv(GLint location,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->UniformMatrix4fv(ctx->driver_ps, location, count, transpose, value);
 
 out:
@@ -1749,8 +1659,6 @@ void yagl_host_glUseProgram(GLuint program)
 
     YAGL_GET_CTX(glUseProgram);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     if (program != 0) {
         program_obj = (struct yagl_gles2_program*)yagl_sharegroup_acquire_object(ctx->sg,
             YAGL_NS_PROGRAM, program);
@@ -1780,8 +1688,6 @@ void yagl_host_glVertexAttrib1f(GLuint indx,
 {
     YAGL_GET_CTX(glVertexAttrib1f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib1f(ctx->driver_ps, indx, x);
 }
 
@@ -1802,8 +1708,6 @@ void yagl_host_glVertexAttrib1fv(GLuint indx,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib1fv(ctx->driver_ps,
                                     indx,
                                     (values_ ? &values[0] : NULL));
@@ -1815,8 +1719,6 @@ void yagl_host_glVertexAttrib2f(GLuint indx,
 {
     YAGL_GET_CTX(glVertexAttrib2f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib2f(ctx->driver_ps, indx, x, y);
 }
 
@@ -1837,8 +1739,6 @@ void yagl_host_glVertexAttrib2fv(GLuint indx,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib2fv(ctx->driver_ps,
                                     indx,
                                     (values_ ? &values[0] : NULL));
@@ -1851,8 +1751,6 @@ void yagl_host_glVertexAttrib3f(GLuint indx,
 {
     YAGL_GET_CTX(glVertexAttrib3f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib3f(ctx->driver_ps, indx, x, y, z);
 }
 
@@ -1873,8 +1771,6 @@ void yagl_host_glVertexAttrib3fv(GLuint indx,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib3fv(ctx->driver_ps,
                                     indx,
                                     (values_ ? &values[0] : NULL));
@@ -1888,8 +1784,6 @@ void yagl_host_glVertexAttrib4f(GLuint indx,
 {
     YAGL_GET_CTX(glVertexAttrib4f);
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib4f(ctx->driver_ps, indx, x, y, z, w);
 }
 
@@ -1910,8 +1804,6 @@ void yagl_host_glVertexAttrib4fv(GLuint indx,
         }
     }
 
-    YAGL_BARRIER_ARG_NORET(gles2_api_ts->ts);
-
     ctx->driver_ps->VertexAttrib4fv(ctx->driver_ps,
                                     indx,
                                     (values_ ? &values[0] : NULL));

diff --git a/hw/yagl_thread.h b/hw/yagl_thread.h
index 91b5fc2..102530c 100644 (file)
--- a/hw/yagl_thread.h
+++ b/hw/yagl_thread.h
@@ -55,8 +55,4 @@ void yagl_thread_call(struct yagl_thread_state *ts,
                       uint8_t *out_buff,
                       uint8_t *in_buff);
 
-#define YAGL_BARRIER_ARG(ts)
-#define YAGL_BARRIER_RET(ts) 1
-#define YAGL_BARRIER_ARG_NORET(ts)
-
 #endif