From c7f0dec3b86ce739c1b0355ab81a67adbef0f721 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Thu, 23 Jul 2015 10:04:00 +0000 Subject: [PATCH] eglut: update git-svn-id: svn://kolibrios.org@5600 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/sdk/sources/eglut/Makefile | 2 +- contrib/sdk/sources/eglut/swap.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/sdk/sources/eglut/Makefile b/contrib/sdk/sources/eglut/Makefile index ae7e7e2450..82b1a25bda 100644 --- a/contrib/sdk/sources/eglut/Makefile +++ b/contrib/sdk/sources/eglut/Makefile @@ -8,7 +8,7 @@ LD = kos32-ld 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+= --out-implib $(IMPLIB) diff --git a/contrib/sdk/sources/eglut/swap.c b/contrib/sdk/sources/eglut/swap.c index 0815b2b99b..3640fc292b 100644 --- a/contrib/sdk/sources/eglut/swap.c +++ b/contrib/sdk/sources/eglut/swap.c @@ -80,6 +80,9 @@ void render_swap_and_blit(struct render *render) glActiveTexture(GL_TEXTURE0); 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; yscale = 1.0/render->scr_height; @@ -100,6 +103,7 @@ void render_swap_and_blit(struct render *render) vertices[3*2+1] = t5; glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glFinish(); err1: eglMakeCurrent(render->dpy, draw, read, context);