keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

eglut: update

Browse Source 
git-svn-id: svn://kolibrios.org@5600 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2015-07-23 10:04:00 +00:00
parent f5f30ba226
commit c7f0dec3b8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/sdk/sources/eglut/Makefile
View File

@ -8,7 +8,7 @@ LD = kos32-ld
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fno-ident -fomit-frame-pointer CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fno-ident -fomit-frame-pointer
INCLUDES= -I. -I../newlib/libc/include -I../Mesa/include -I../Mesa/src/gbm/main -I../libdrm/include INCLUDES= -I. -I../newlib/libc/include -I../Mesa/mesa-9.2.5/include -I../Mesa/mesa-9.2.5/src/gbm/main -I../libdrm/include
LDFLAGS:= -shared -s -nostdlib -T ../newlib/libc/dll.lds --entry _DllStartup --image-base=0 LDFLAGS:= -shared -s -nostdlib -T ../newlib/libc/dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --out-implib $(IMPLIB) LDFLAGS+= --out-implib $(IMPLIB)

4
contrib/sdk/sources/eglut/swap.c
View File

@ -80,6 +80,9 @@ void render_swap_and_blit(struct render *render)
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]);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, render->tx_mask);
xscale = 1.0/render->scr_width; xscale = 1.0/render->scr_width;
yscale = 1.0/render->scr_height; yscale = 1.0/render->scr_height;
@ -100,6 +103,7 @@ void render_swap_and_blit(struct render *render)
vertices[3*2+1] = t5; vertices[3*2+1] = t5;
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
glFinish();
err1: err1:
eglMakeCurrent(render->dpy, draw, read, context); eglMakeCurrent(render->dpy, draw, read, context);