WebSVN – Kolibri OS – Diff – /contrib/sdk/sources/render/render.c

 struct render* create_render(EGLDisplay dpy, EGLSurface surface, int dx, int dy)
+{
     const char *vs_src =
 	    "attribute vec4 v_position;\n"
 	    "attribute vec4 v_texcoord0;\n"
-        "attribute vec4 v_texcoord1;\n"
 	    "varying vec2 source_texture;\n"
-        "varying vec2 mask_texture;\n"
         "void main()\n"
 	    "{\n"
 	    "	gl_Position = v_position;\n"
 	    "	source_texture = v_texcoord0.xy;\n"
-        "   mask_texture   = v_texcoord1.xy;\n"
 	    "}\n";
 	const char *fs_src =
-	    "varying vec2 source_texture;\n"
-        "varying vec2 mask_texture;\n"
+	    "varying vec2 source_texture;\n"
         "uniform sampler2D sampler_src;\n"
         "uniform sampler2D sampler_mask;\n"
 	    "void main()\n"
 	    "{\n"
-        "   float ca = texture2D(sampler_mask, mask_texture).r;\n"
+        "   float ca = texture2D(sampler_mask, source_texture).r;\n"
         "   gl_FragColor = vec4(texture2D(sampler_src, source_texture).rgb, ca);\n"
 	    "}\n";
     if(glGetError() != GL_NO_ERROR)
        goto err6;
     glBindTexture(GL_TEXTURE_2D, 0);
     render->back_buffer = EGL_DRM_BUFFER_BACK;
     render->back_buffer = EGL_DRM_BUFFER_FRONT;
     render->screen = px_create_image(dpy,context,fb.width,fb.height,
     glAttachShader(render->blit_prog, vs_shader);
     glAttachShader(render->blit_prog, fs_shader);
     glBindAttribLocation(render->blit_prog, 0, "v_position");
-    glBindAttribLocation(render->blit_prog, 1, "v_texcoord0");
-    glBindAttribLocation(render->blit_prog, 2, "v_texcoord1");
+    glBindAttribLocation(render->blit_prog, 1, "v_texcoord0");
     glLinkProgram(render->blit_prog);
     glGetProgramiv(render->blit_prog, GL_LINK_STATUS, &ret);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float),render->tc_src);
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float),render->tc_mask);
-    glEnableVertexAttribArray(2);
+    glEnableVertexAttribArray(1);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-void create_mask(struct render *render)
-{
+void create_mask(struct render *render)
-    static EGLint attrib[] =
-    {
+{
-        EGL_GL_TEXTURE_LEVEL_KHR, 0,
+    struct drm_i915_gem_create create;
-        EGL_NONE
+    struct drm_gem_flink flink;
     };
-    struct drm_i915_gem_mmap_gtt mmap_arg;
+    struct drm_i915_gem_mmap mmap_arg;
+    EGLint handle, stride;
+    int winw, winh, pitch;
+    void *data;
+    int ret;
-    EGLint handle, stride;
+    GLuint mask_handle, mask_name;
-    int winw, winh, pitch;
+    EGLImageKHR mask_image;
-    void *data;
     glGenTextures(1, &render->tx_mask);
     if(glGetError() != GL_NO_ERROR)
-       goto err1;
-    glBindTexture(GL_TEXTURE_2D, render->tx_mask);
+       return;
-    if(glGetError() != GL_NO_ERROR)
+    glBindTexture(GL_TEXTURE_2D, render->tx_mask);
+    if(glGetError() != GL_NO_ERROR)
+       goto err1;
+    pitch = (render->width+15) & ~15;
+    create.size = pitch *render->height;
+    create.handle = 0;
+    ret = drm_ioctl(render->fd, DRM_IOCTL_I915_GEM_CREATE, &create);
+    if(ret != 0)
-       goto err2;
+        goto err1;
+    flink.handle = create.handle;
+    ret = drm_ioctl(render->fd, DRM_IOCTL_GEM_FLINK, &flink);
+    if (ret != 0)
+        goto err2;
+    mask_handle = create.handle;
+    mask_name = flink.name;
+    printf("create mask bo handle %d name %d\n", create.handle, flink.name);
+    EGLint attribs[] = {
-    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
+        EGL_WIDTH, 0,
+        EGL_HEIGHT, 0,
-    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
+        EGL_DRM_BUFFER_STRIDE_MESA, 0,
+        EGL_DRM_BUFFER_FORMAT_MESA,
-    winw = render->width+10;
+        EGL_DRM_BUFFER_FORMAT_R8_MESA,
-    winh = render->height+20+5;
-    pitch = (winw+3) & -4;
+        EGL_DRM_BUFFER_USE_MESA,
+        EGL_DRM_BUFFER_USE_SHARE_MESA,
-    data = user_alloc(pitch * winh);
+        EGL_NONE
-    memset(data, 0x20, pitch * winh);
+    };
+    attribs[1] = pitch;
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, winw, winh, 0,
+    attribs[3] = render->height;
-                 GL_RED,GL_UNSIGNED_BYTE, data);
+    attribs[5] = pitch;
-    user_free(data);
+    mask_image = eglCreateImageKHR(render->dpy, render->context, EGL_DRM_BUFFER_MESA,
+                         (void *) (uintptr_t)mask_name, attribs);
     if(glGetError() != GL_NO_ERROR)
-       goto err2;
+    printf("create mask image %p\n", mask_image);
     render->mask = eglCreateImageKHR(render->dpy, render->context,
-                                     EGL_GL_TEXTURE_2D_KHR,(EGLClientBuffer)render->tx_mask,attrib);
+    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
-    if(render->mask == EGL_NO_IMAGE_KHR)
-        goto err2;
+    glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, mask_image);
-    if(!eglExportDRMImageMESA(render->dpy, render->mask, NULL, &handle, &stride))
-        goto err3;
+    if(glGetError() != GL_NO_ERROR)
        goto err2;
-    glBindTexture(GL_TEXTURE_2D, 0);
     glBindTexture(GL_TEXTURE_2D, 0);
     mmap_arg.handle = handle;
-    mmap_arg.offset = 0;
+    mmap_arg.handle = mask_handle;
-//    mmap_arg.size = stride * winh;
+    mmap_arg.offset = 0;
-    if (drm_ioctl(render->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg))
+    mmap_arg.size = pitch * render->height;

Subversion Repositories Kolibri OS

(root)/contrib/sdk/sources/render/render.c – Rev 4523 → 4525