XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

GL blitter: skip output for rolled or minimized windows

Browse Source 
git-svn-id: svn://kolibrios.org@4526 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2014-01-25 10:22:35 +00:00
parent a95c356dc8
commit 67ecf703f6
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/sdk/sources/render/render.c
View File

@ -340,6 +340,15 @@ struct render* create_render(EGLDisplay dpy, EGLSurface surface, int dx, int dy)
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float),render->tc_src); glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float),render->tc_src);
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
render->tc_src[0] = 0.0;
render->tc_src[1] = 0.0;
render->tc_src[1*2] = 1.0;
render->tc_src[1*2+1]= 0.0;
render->tc_src[2*2] = 1.0;
render->tc_src[2*2+1]= 1.0;
render->tc_src[3*2] = 0.0;
render->tc_src[3*2+1]= 1.0;
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);

37
contrib/sdk/sources/render/swap.c
View File

@ -6,6 +6,9 @@
#include <i915_drm.h> #include <i915_drm.h>
#include <kos32sys.h> #include <kos32sys.h>
#define WIN_STATE_MINIMIZED 0x02
#define WIN_STATE_ROLLED 0x04
static int drm_ioctl(int fd, unsigned long request, void *arg) static int drm_ioctl(int fd, unsigned long request, void *arg)
{ {
ioctl_t io; ioctl_t io;
@ -27,8 +30,8 @@ void render_swap_and_blit(struct render *render)
EGLContext context; EGLContext context;
EGLSurface draw, read; EGLSurface draw, read;
int winx, winy, winw, winh; uint32_t winx, winy, winw, winh;
uint8_t state;
float xscale, yscale; float xscale, yscale;
float *vertices = render->vertices; float *vertices = render->vertices;
float *texcoords = render->tc_src; float *texcoords = render->tc_src;
@ -43,6 +46,10 @@ void render_swap_and_blit(struct render *render)
winy = *(uint32_t*)(proc_info+38); winy = *(uint32_t*)(proc_info+38);
winw = *(uint32_t*)(proc_info+42)+1; winw = *(uint32_t*)(proc_info+42)+1;
winh = *(uint32_t*)(proc_info+46)+1; winh = *(uint32_t*)(proc_info+46)+1;
state = *(uint8_t*)(proc_info+70);
if(state & (WIN_STATE_MINIMIZED|WIN_STATE_ROLLED))
return;
context = eglGetCurrentContext(); context = eglGetCurrentContext();
draw = eglGetCurrentSurface(EGL_DRAW); draw = eglGetCurrentSurface(EGL_DRAW);
@ -64,23 +71,14 @@ void render_swap_and_blit(struct render *render)
if(drm_ioctl(render->fd, 45, &update)) if(drm_ioctl(render->fd, 45, &update))
return; return;
if (!eglMakeCurrent(render->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, render->context)) if (!eglMakeCurrent(render->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, render->context))
{ {
printf("failed to make window current"); printf("failed to make window current");
goto err1; goto err1;
}; };
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, render->tx_buffers[render->back_buffer]); glBindTexture(GL_TEXTURE_2D, render->tx_buffers[render->back_buffer]);
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MIN_FILTER,
GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MAG_FILTER,
GL_NEAREST);
xscale = 1.0/render->scr_width; xscale = 1.0/render->scr_width;
yscale = 1.0/render->scr_height; yscale = 1.0/render->scr_height;
@ -101,23 +99,8 @@ void render_swap_and_blit(struct render *render)
vertices[1*2+1] = t1; vertices[1*2+1] = t1;
vertices[3*2+1] = t5; vertices[3*2+1] = t5;
texcoords[0] = 0.0;
texcoords[1] = 0.0;
texcoords[1*2] = 1.0;
texcoords[1*2+1]= 0.0;
texcoords[2*2] = 1.0;
texcoords[2*2+1]= 1.0;
texcoords[3*2] = 0.0;
texcoords[3*2+1]= 1.0;
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
glFlush(); // glFlush();
// glDisableVertexAttribArray(0);
// glDisableVertexAttribArray(1);
// glDisable(GL_TEXTURE_2D);
// glUseProgram(0);
err1: err1:
eglMakeCurrent(render->dpy, draw, read, context); eglMakeCurrent(render->dpy, draw, read, context);