From 11b3a682031a41f4ebdb8adf6ed166cd45a82201 Mon Sep 17 00:00:00 2001 From: IgorA Date: Mon, 3 Nov 2014 15:53:21 +0000 Subject: [PATCH] fix in glClearColor git-svn-id: svn://kolibrios.org@5163 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../libraries/TinyGL/asm_fork/clear.asm | 23 +++++++++++-------- .../TinyGL/asm_fork/examples/test0.asm | 1 + 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/programs/develop/libraries/TinyGL/asm_fork/clear.asm b/programs/develop/libraries/TinyGL/asm_fork/clear.asm index 3522e7d875..2aabccdcfc 100644 --- a/programs/develop/libraries/TinyGL/asm_fork/clear.asm +++ b/programs/develop/libraries/TinyGL/asm_fork/clear.asm @@ -7,6 +7,7 @@ proc glopClearColor uses ecx esi edi, context:dword, p:dword add edi,offs_cont_clear_color mov ecx,4 rep movsd + ret endp align 4 @@ -18,18 +19,22 @@ proc glopClearDepth uses eax ebx, context:dword, p:dword ret endp +align 4 +fl_65535 dd 65535.0 + align 4 proc glopClear uses eax ebx, context:dword, p:dword mov eax,[context] - mov ebx,[eax+offs_cont_clear_color+8] ;context.clear_color.v[2] - shl ebx,16 - push ebx - mov ebx,[eax+offs_cont_clear_color+4] ;context.clear_color.v[1] - shl ebx,16 - push ebx - mov ebx,[eax+offs_cont_clear_color] ;context.clear_color.v[0] - shl ebx,16 - push ebx + fld dword[eax+offs_cont_clear_color+8] ;context.clear_color.v[2] + fmul dword[fl_65535] + fistp dword[esp-4] + fld dword[eax+offs_cont_clear_color+4] ;context.clear_color.v[1] + fmul dword[fl_65535] + fistp dword[esp-8] + fld dword[eax+offs_cont_clear_color] ;context.clear_color.v[0] + fmul dword[fl_65535] + fistp dword[esp-12] + sub esp,12 mov ebx,[p] mov ebx,[ebx+4] ;ebx = p[1] diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/test0.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/test0.asm index 5f07992119..005118b545 100644 --- a/programs/develop/libraries/TinyGL/asm_fork/examples/test0.asm +++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test0.asm @@ -26,6 +26,7 @@ start: stdcall [kosglMakeCurrent], 10,10,300,225,ctx1 stdcall [glEnable], GL_DEPTH_TEST +stdcall [glClearColor], 0.2,0.0,0.2,0.0 call draw_3d