April 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : icinfo: Fix vsnprintfW usage.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: b3b498b5cc3a7f97e923c3144a6a3608350f679c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b498b5cc3a7f97e923c3144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 16:16:35 2013 +0200 icinfo: Fix vsnprintfW usage. --- programs/icinfo/icinfo.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 1801d09..bfbef6b 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -29,33 +29,26 @@ static int mywprintf(const WCHAR *format, ...) static WCHAR output_bufW[sizeof(output_bufA) / sizeof(WCHAR)]; va_list parms; DWORD nOut; - int len; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); va_start(parms, format); - len = vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); + vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); va_end(parms); - if (len < 0) - { - /* String too long */ - return 0; - } /* Try to write as unicode whenever we think it's a console */ if (((DWORD_PTR)hout & 3) == 3) { - res = WriteConsoleW(hout, output_bufW, len, &nOut, NULL); + res = WriteConsoleW(hout, output_bufW, strlenW(output_bufW), &nOut, NULL); } else { - BOOL usedDefaultChar = FALSE; DWORD convertedChars; /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, len, + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, -1, output_bufA, sizeof(output_bufA), - "?", &usedDefaultChar); + NULL, NULL); res = WriteFile(hout, output_bufA, convertedChars, &nOut, FALSE); }

1 0

Ken Thomases : libwine: Make [v]snprintW() always null-terminate the buffer , even if it's short.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: 71377c5652a2125b46ea7ad8651f73c1852a0083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71377c5652a2125b46ea7ad86… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 10 08:40:02 2013 -0500 libwine: Make [v]snprintW() always null-terminate the buffer, even if it's short. --- libs/wine/string.c | 67 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 28 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 0b42ea8..f2a9bd3 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -300,7 +300,7 @@ noconv: /* format a WCHAR string according to a printf format; helper for vsnprintfW */ -static int format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len ) +static size_t format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len ) { size_t count = 0; int i, left_align = 0, width = 0, max = 0; @@ -331,18 +331,25 @@ static int format_string( WCHAR *buffer, size_t len, const char *format, const W if (!left_align && width > max) { - if ((count += width - max) >= len) return -1; - for (i = 0; i < width - max; i++) *buffer++ = ' '; + for (i = 0; i < width - max; i++) + { + if (count++ < len) + *buffer++ = ' '; + } } - if ((count += max) >= len) return -1; - memcpy( buffer, str, max * sizeof(WCHAR) ); + if (count < len) + memcpy( buffer, str, min( max, len - count ) * sizeof(WCHAR) ); + count += max; buffer += max; if (left_align && width > max) { - if ((count += width - max) >= len) return -1; - for (i = 0; i < width - max; i++) *buffer++ = ' '; + for (i = 0; i < width - max; i++) + { + if (count++ < len) + *buffer++ = ' '; + } } return count; } @@ -357,17 +364,16 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { while (*iter && *iter != '%') { - if (written++ >= len) - return -1; - *str++ = *iter++; + if (written++ < len) + *str++ = *iter; + iter++; } if (*iter == '%') { if (iter[1] == '%') { - if (written++ >= len) - return -1; - *str++ = '%'; /* "%%"->'%' */ + if (written++ < len) + *str++ = '%'; /* "%%"->'%' */ iter += 2; continue; } @@ -422,13 +428,13 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { static const WCHAR none[] = { '(','n','u','l','l',')',0 }; const WCHAR *wstr = va_arg(valist, const WCHAR *); - int count; + size_t remaining = written < len ? len - written : 0; + size_t count; *fmta++ = 's'; *fmta = 0; - count = format_string( str, len - written, fmtbufa, wstr ? wstr : none, -1 ); - if (count == -1) return -1; - str += count; + count = format_string( str, remaining, fmtbufa, wstr ? wstr : none, -1 ); + str += min( count, remaining ); written += count; iter++; break; @@ -437,14 +443,14 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) case 'c': { WCHAR wstr; - int count; + size_t remaining = written < len ? len - written : 0; + size_t count; wstr = va_arg(valist, int); *fmta++ = 's'; *fmta = 0; - count = format_string( str, len - written, fmtbufa, &wstr, 1 ); - if (count == -1) return -1; - str += count; + count = format_string( str, remaining, fmtbufa, &wstr, 1 ); + str += min( count, remaining ); written += count; iter++; break; @@ -475,9 +481,9 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) } while (*bufaiter) { - if (written++ >= len) - return -1; - *str++ = *bufaiter++; + if (written++ < len) + *str++ = *bufaiter; + bufaiter++; } iter++; break; @@ -485,10 +491,15 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) } } } - if (written >= len) - return -1; - *str++ = 0; - return (int)written; + if (len) + { + if (written >= len) + str--; + *str++ = 0; + } + + /* FIXME: POSIX [v]snprintf() returns the equivalent of written, not -1, on short buffer. */ + return written < len ? (int)written : -1; } int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist )

1 0

Matteo Bruni : wined3d: Update comment on top of format_texture_info[].
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: 50a91e11c690b1016fd26cfe6dcd12bd036f99bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a91e11c690b1016fd26cfe6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:43 2013 +0200 wined3d: Update comment on top of format_texture_info[]. --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d2ada07..d7cec9b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -582,10 +582,10 @@ static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT pitch, UI * WINED3DFMT_NVHS */ static const struct wined3d_format_texture_info format_texture_info[] = { - /* format id internal srgbInternal rtInternal - format type + /* format id gl_internal gl_srgb_internal gl_rt_internal + gl_format gl_type conv_byte_count flags - extension */ + extension convert */ /* FourCC formats */ /* GL_APPLE_ycbcr_422 claims that its '2YUV' format, which is supported via the UNSIGNED_SHORT_8_8_REV_APPLE type * is equivalent to 'UYVY' format on Windows, and the 'YUVS' via UNSIGNED_SHORT_8_8_APPLE equates to 'YUY2'. The

1 0

Stefan Dösinger : wined3d: Remove the unused idx_data parameter from draw_primitive.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: 822bcfdf744f3f1853ce65363216a2ee7cad7258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822bcfdf744f3f1853ce65363… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 10 13:39:46 2013 +0200 wined3d: Remove the unused idx_data parameter from draw_primitive. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b5c9dc..34a58aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4027,7 +4027,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT /* Account for the loading offset due to index buffers. Instead of * reloading all sources correct it with the startvertex parameter. */ - draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE, NULL); + draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE); return WINED3D_OK; } @@ -4060,7 +4060,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - draw_primitive(device, start_idx, index_count, 0, 0, TRUE, NULL); + draw_primitive(device, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK; } @@ -4070,7 +4070,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device { TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE, NULL); + draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE); } /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5fe1ac5..14cb18f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -577,7 +577,7 @@ static void remove_vbos(const struct wined3d_gl_info *gl_info, /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed, const void *idx_data) + UINT start_instance, UINT instance_count, BOOL indexed) { const struct wined3d_state *state = &device->stateBlock->state; const struct wined3d_stream_info *stream_info; @@ -586,6 +586,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL emulation = FALSE; + const void *idx_data = NULL; UINT idx_size = 0; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bdba525..9ca2b10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -925,7 +925,7 @@ struct wined3d_stream_info }; void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed, const void *idx_data) DECLSPEC_HIDDEN; + UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; typedef void (WINE_GLAPI *glAttribFunc)(const void *data);

1 0

Matteo Bruni : wined3d: Avoid redundant glDrawBuffer() calls.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: 075fa6547c0edf2b1b2c1cabae7731fdc1308cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075fa6547c0edf2b1b2c1caba… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:42 2013 +0200 wined3d: Avoid redundant glDrawBuffer() calls. --- dlls/wined3d/context.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 90038ca..516e8c2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1897,13 +1897,16 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) { const struct wined3d_gl_info *gl_info = context->gl_info; + DWORD *current_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; + DWORD new_mask = context_generate_rt_mask(buffer); + + if (new_mask == *current_mask) + return; gl_info->gl_ops.gl.p_glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - if (context->current_fbo) - context->current_fbo->rt_mask = context_generate_rt_mask(buffer); - else - context->draw_buffers_mask = context_generate_rt_mask(buffer); + + *current_mask = new_mask; } /* Context activation is done by the caller. */

1 0

Matteo Bruni : wined3d: Fix typo, really check whether color fixups are supported.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: 0d563a69dd171c1ca80ecbc410c41b0814b6d522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d563a69dd171c1ca80ecbc41… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:41 2013 +0200 wined3d: Fix typo, really check whether color fixups are supported. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7c508ee..d2ada07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1724,7 +1724,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { - struct wined3d_format *format = &gl_info->formats[idx]; + struct wined3d_format *format = &gl_info->formats[i]; if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) continue;

1 0

Matteo Bruni : d3dx9/tests: Don' t use an arbitrary number in relative_error macro.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: 3fd07694c41418ce7e6cb1642357d708be897194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd07694c41418ce7e6cb1642… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:22:59 2013 +0200 d3dx9/tests: Don't use an arbitrary number in relative_error macro. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8677825..9d90662 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -27,7 +27,7 @@ #define admitted_error 0.0001f -#define relative_error(exp, out) (fabsf(exp) < 0.01f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) +#define relative_error(exp, out) (fabsf(exp) < 1e-38f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) #define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);

1 0

Michael Stefaniuc : dplayx: Forward IDirectPlayLobby::Connect to :: ConnectEx.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: f27358416ccbe78be67f16ce1dbe2ce6822bb2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27358416ccbe78be67f16ce1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:38:44 2013 +0200 dplayx: Forward IDirectPlayLobby::Connect to ::ConnectEx. --- dlls/dplayx/dplobby.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index b9e126f..e09d6c8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -412,26 +412,16 @@ static HRESULT DPL_ConnectEx return hr; } -static HRESULT WINAPI IDirectPlayLobbyAImpl_Connect -( LPDIRECTPLAYLOBBYA iface, - DWORD dwFlags, - LPDIRECTPLAY2A* lplpDP, - IUnknown* pUnk) +static HRESULT WINAPI IDirectPlayLobby3AImpl_Connect( IDirectPlayLobby3A *iface, DWORD flags, + IDirectPlay2A **dp, IUnknown *unk) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; - return DPL_ConnectEx( This, dwFlags, &IID_IDirectPlay2A, - (LPVOID)lplpDP, pUnk ); + return IDirectPlayLobby_ConnectEx( iface, flags, &IID_IDirectPlay2A, (void**)dp, unk ); } -static HRESULT WINAPI IDirectPlayLobbyWImpl_Connect -( LPDIRECTPLAYLOBBY iface, - DWORD dwFlags, - LPDIRECTPLAY2* lplpDP, - IUnknown* pUnk) +static HRESULT WINAPI IDirectPlayLobby3Impl_Connect( IDirectPlayLobby3 *iface, DWORD flags, + IDirectPlay2 **dp, IUnknown *unk) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; /* Yes cast to A */ - return DPL_ConnectEx( This, dwFlags, &IID_IDirectPlay2, - (LPVOID)lplpDP, pUnk ); + return IDirectPlayLobby_ConnectEx( iface, flags, &IID_IDirectPlay2A, (void**)dp, unk ); } /******************************************************************** @@ -1610,7 +1600,7 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = XCAST(AddRef)DPL_AddRef, XCAST(Release)DPL_Release, - XCAST(Connect)IDirectPlayLobbyAImpl_Connect, + IDirectPlayLobby3AImpl_Connect, XCAST(CreateAddress)IDirectPlayLobbyAImpl_CreateAddress, XCAST(EnumAddress)IDirectPlayLobbyAImpl_EnumAddress, XCAST(EnumAddressTypes)IDirectPlayLobbyAImpl_EnumAddressTypes, @@ -1646,7 +1636,7 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3WVT = XCAST(AddRef)DPL_AddRef, XCAST(Release)DPL_Release, - XCAST(Connect)IDirectPlayLobbyWImpl_Connect, + IDirectPlayLobby3Impl_Connect, XCAST(CreateAddress)IDirectPlayLobbyWImpl_CreateAddress, XCAST(EnumAddress)IDirectPlayLobbyWImpl_EnumAddress, XCAST(EnumAddressTypes)IDirectPlayLobbyWImpl_EnumAddressTypes,

1 0

Matteo Bruni : wined3d: Reset all the dummy textures to 0 on destroy.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: a0c06a94aa8a9068e346299427dc8e935151df2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c06a94aa8a9068e34629942… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:40 2013 +0200 wined3d: Reset all the dummy textures to 0 on destroy. --- dlls/wined3d/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e4b970c..f94d77a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -982,10 +982,10 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w gl_info->gl_ops.gl.p_glDeleteTextures(count, device->dummy_texture_2d); checkGLcall("glDeleteTextures(count, device->dummy_texture_2d)"); - memset(device->dummy_texture_cube, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_cube)); - memset(device->dummy_texture_3d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_3d)); - memset(device->dummy_texture_rect, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_rect)); - memset(device->dummy_texture_2d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_2d)); + memset(device->dummy_texture_cube, 0, count * sizeof(*device->dummy_texture_cube)); + memset(device->dummy_texture_3d, 0, count * sizeof(*device->dummy_texture_3d)); + memset(device->dummy_texture_rect, 0, count * sizeof(*device->dummy_texture_rect)); + memset(device->dummy_texture_2d, 0, count * sizeof(*device->dummy_texture_2d)); } static LONG fullscreen_style(LONG style)

1 0

Matteo Bruni : wined3d: Remove useless glClearxxx calls.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: 46fa0448d9f668611383e722f5016669edcdfbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fa0448d9f668611383e722f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:39 2013 +0200 wined3d: Remove useless glClearxxx calls. --- dlls/wined3d/context.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cf65225..90038ca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1464,14 +1464,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); TRACE("Setting up the screen\n"); - /* Clear the screen */ - gl_info->gl_ops.gl.p_glClearColor(1.0f, 0.0f, 0.0f, 0.0f); - checkGLcall("glClearColor"); - gl_info->gl_ops.gl.p_glClearIndex(0); - gl_info->gl_ops.gl.p_glClearDepth(1); - gl_info->gl_ops.gl.p_glClearStencil(0xffff); - - checkGLcall("glClear"); gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);");

1 0