July 2012 - Wine-Commits - list.winehq.org

Alexandre Julliard : opengl32: Add a mechanism for managing different types of OpenGL handles.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 98bd066c952c4d54a44c6da18521a0b6363f4a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bd066c952c4d54a44c6da18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 12:27:19 2012 +0200 opengl32: Add a mechanism for managing different types of OpenGL handles. --- dlls/opengl32/wgl.c | 80 ++++++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 85eaf22..b06847c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -78,12 +78,22 @@ extern BOOL WINAPI GdiSwapBuffers( HDC hdc ); #define MAX_WGL_HANDLES 1024 +enum wgl_handle_type +{ + HANDLE_CONTEXT = 0 << 12, + HANDLE_TYPE_MASK = 15 << 12 +}; + struct wgl_handle { UINT handle; DWORD tid; - struct wgl_context *context; struct opengl_funcs *funcs; + union + { + struct wgl_context *context; /* for HANDLE_CONTEXT */ + struct wgl_handle *next; /* for free handles */ + } u; }; static struct wgl_handle wgl_handles[MAX_WGL_HANDLES]; @@ -106,24 +116,24 @@ static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) return funcs; } -static inline HGLRC next_handle( struct wgl_handle *ptr ) +static inline HANDLE next_handle( struct wgl_handle *ptr, enum wgl_handle_type type ) { WORD generation = HIWORD( ptr->handle ) + 1; if (!generation) generation++; - ptr->handle = MAKELONG( ptr - wgl_handles, generation ); + ptr->handle = MAKELONG( ptr - wgl_handles, generation ) | type; return ULongToHandle( ptr->handle ); } -/* the current handle is assumed valid and doesn't need locking */ -static inline struct wgl_handle *get_current_handle_ptr(void) +/* the current context is assumed valid and doesn't need locking */ +static inline struct wgl_handle *get_current_context_ptr(void) { if (!NtCurrentTeb()->glCurrentRC) return NULL; - return &wgl_handles[LOWORD(NtCurrentTeb()->glCurrentRC)]; + return &wgl_handles[LOWORD(NtCurrentTeb()->glCurrentRC) & ~HANDLE_TYPE_MASK]; } -static struct wgl_handle *get_handle_ptr( HGLRC handle ) +static struct wgl_handle *get_handle_ptr( HANDLE handle, enum wgl_handle_type type ) { - unsigned int index = LOWORD( handle ); + unsigned int index = LOWORD( handle ) & ~HANDLE_TYPE_MASK; EnterCriticalSection( &wgl_section ); if (index < handle_count && ULongToHandle(wgl_handles[index].handle) == handle) @@ -139,22 +149,22 @@ static void release_handle_ptr( struct wgl_handle *ptr ) if (ptr) LeaveCriticalSection( &wgl_section ); } -static HGLRC alloc_handle( struct wgl_context *context, struct opengl_funcs *funcs ) +static HANDLE alloc_handle( enum wgl_handle_type type, struct opengl_funcs *funcs, void *user_ptr ) { - HGLRC handle = 0; + HANDLE handle = 0; struct wgl_handle *ptr = NULL; EnterCriticalSection( &wgl_section ); if ((ptr = next_free)) - next_free = (struct wgl_handle *)next_free->context; + next_free = next_free->u.next; else if (handle_count < MAX_WGL_HANDLES) ptr = &wgl_handles[handle_count++]; if (ptr) { - ptr->context = context; ptr->funcs = funcs; - handle = next_handle( ptr ); + ptr->u.context = user_ptr; + handle = next_handle( ptr, type ); } else SetLastError( ERROR_NOT_ENOUGH_MEMORY ); LeaveCriticalSection( &wgl_section ); @@ -164,7 +174,7 @@ static HGLRC alloc_handle( struct wgl_context *context, struct opengl_funcs *fun static void free_handle_ptr( struct wgl_handle *ptr ) { ptr->handle |= 0xffff; - ptr->context = (struct wgl_context *)next_free; + ptr->u.next = next_free; ptr->funcs = NULL; next_free = ptr; LeaveCriticalSection( &wgl_section ); @@ -187,11 +197,11 @@ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) struct wgl_handle *src, *dst; BOOL ret = FALSE; - if (!(src = get_handle_ptr( hglrcSrc ))) return FALSE; - if ((dst = get_handle_ptr( hglrcDst ))) + if (!(src = get_handle_ptr( hglrcSrc, HANDLE_CONTEXT ))) return FALSE; + if ((dst = get_handle_ptr( hglrcDst, HANDLE_CONTEXT ))) { if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); - else ret = src->funcs->wgl.p_wglCopyContext( src->context, dst->context, mask ); + else ret = src->funcs->wgl.p_wglCopyContext( src->u.context, dst->u.context, mask ); } release_handle_ptr( dst ); release_handle_ptr( src ); @@ -203,7 +213,7 @@ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) */ BOOL WINAPI wglDeleteContext(HGLRC hglrc) { - struct wgl_handle *ptr = get_handle_ptr( hglrc ); + struct wgl_handle *ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ); if (!ptr) return FALSE; @@ -214,7 +224,7 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) return FALSE; } if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); - ptr->funcs->wgl.p_wglDeleteContext( ptr->context ); + ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context ); free_handle_ptr( ptr ); return TRUE; } @@ -225,14 +235,14 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) { BOOL ret = TRUE; - struct wgl_handle *ptr, *prev = get_current_handle_ptr(); + struct wgl_handle *ptr, *prev = get_current_context_ptr(); if (hglrc) { - if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; + if (!(ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ))) return FALSE; if (!ptr->tid || ptr->tid == GetCurrentThreadId()) { - ret = ptr->funcs->wgl.p_wglMakeCurrent( hdc, ptr->context ); + ret = ptr->funcs->wgl.p_wglMakeCurrent( hdc, ptr->u.context ); if (ret) { if (prev) prev->tid = 0; @@ -276,11 +286,11 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs || !funcs->ext.p_wglCreateContextAttribsARB) return 0; - if (share && !(share_ptr = get_handle_ptr( share ))) return 0; - if ((context = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->context : NULL, + if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; + if ((context = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context : NULL, attribs ))) { - ret = alloc_handle( context, funcs ); + ret = alloc_handle( HANDLE_CONTEXT, funcs, context ); if (!ret) funcs->wgl.p_wglDeleteContext( context ); } release_handle_ptr( share_ptr ); @@ -296,15 +306,15 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) { BOOL ret = TRUE; - struct wgl_handle *ptr, *prev = get_current_handle_ptr(); + struct wgl_handle *ptr, *prev = get_current_context_ptr(); if (hglrc) { - if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; + if (!(ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ))) return FALSE; if (!ptr->tid || ptr->tid == GetCurrentThreadId()) { ret = (ptr->funcs->ext.p_wglMakeContextCurrentARB && - ptr->funcs->ext.p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->context )); + ptr->funcs->ext.p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->u.context )); if (ret) { if (prev) prev->tid = 0; @@ -351,11 +361,11 @@ BOOL WINAPI wglShareLists(HGLRC hglrcSrc, HGLRC hglrcDst) BOOL ret = FALSE; struct wgl_handle *src, *dst; - if (!(src = get_handle_ptr( hglrcSrc ))) return FALSE; - if ((dst = get_handle_ptr( hglrcDst ))) + if (!(src = get_handle_ptr( hglrcSrc, HANDLE_CONTEXT ))) return FALSE; + if ((dst = get_handle_ptr( hglrcDst, HANDLE_CONTEXT ))) { if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); - else ret = src->funcs->wgl.p_wglShareLists( src->context, dst->context ); + else ret = src->funcs->wgl.p_wglShareLists( src->u.context, dst->u.context ); } release_handle_ptr( dst ); release_handle_ptr( src ); @@ -367,9 +377,9 @@ BOOL WINAPI wglShareLists(HGLRC hglrcSrc, HGLRC hglrcDst) */ HDC WINAPI wglGetCurrentDC(void) { - struct wgl_handle *context = get_current_handle_ptr(); + struct wgl_handle *context = get_current_context_ptr(); if (!context) return 0; - return context->funcs->wgl.p_wglGetCurrentDC( context->context ); + return context->funcs->wgl.p_wglGetCurrentDC( context->u.context ); } /*********************************************************************** @@ -383,7 +393,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc) if (!funcs) return 0; if (!(context = funcs->wgl.p_wglCreateContext( hdc ))) return 0; - ret = alloc_handle( context, funcs ); + ret = alloc_handle( HANDLE_CONTEXT, funcs, context ); if (!ret) funcs->wgl.p_wglDeleteContext( context ); return ret; } @@ -696,7 +706,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) void *local_func; OpenGL_extension ext; const OpenGL_extension *ext_ret; - struct wgl_handle *context = get_current_handle_ptr(); + struct wgl_handle *context = get_current_context_ptr(); TRACE("(%s)\n", lpszProc);

1 0

Alexandre Julliard : winex11: Remove unused fields in the PBuffer object.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 76ae99a426ce31bd32a59aa616aeeebba5529ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ae99a426ce31bd32a59aa61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 12:35:24 2012 +0200 winex11: Remove unused fields in the PBuffer object. --- dlls/winex11.drv/opengl.c | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 83cc90d..5d1c5a8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -163,13 +163,10 @@ struct wgl_context struct wgl_pbuffer { Drawable drawable; - Display* display; WineGLPixelFormat* fmt; int width; int height; int* attribList; - HDC hdc; - int use_render_texture; /* This is also the internal texture format */ int texture_bind_target; int texture_bpp; @@ -1968,16 +1965,10 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat TRACE("(%p, %d, %d, %d, %p)\n", hdc, iPixelFormat, iWidth, iHeight, piAttribList); - if (0 >= iPixelFormat) { - ERR("(%p): unexpected iPixelFormat(%d) <= 0, returns NULL\n", hdc, iPixelFormat); - SetLastError(ERROR_INVALID_PIXEL_FORMAT); - return NULL; /* unexpected error */ - } - /* Convert the WGL pixelformat to a GLX format, if it fails then the format is invalid */ fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, TRUE /* Offscreen */, &nCfgs); if(!fmt) { - ERR("(%p): unexpected iPixelFormat(%d) > nFormats(%d), returns NULL\n", hdc, iPixelFormat, nCfgs); + ERR("(%p): invalid pixel format %d\n", hdc, iPixelFormat); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } @@ -1987,8 +1978,6 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat SetLastError(ERROR_NO_SYSTEM_RESOURCES); return NULL; } - object->hdc = hdc; - object->display = gdi_display; object->width = iWidth; object->height = iHeight; object->fmt = fmt; @@ -2156,7 +2145,7 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) TRACE("(%p)\n", object); wine_tsx11_lock(); - pglXDestroyPbuffer(object->display, object->drawable); + pglXDestroyPbuffer(gdi_display, object->drawable); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, object); return GL_TRUE; @@ -2201,12 +2190,12 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut switch (iAttribute) { case WGL_PBUFFER_WIDTH_ARB: wine_tsx11_lock(); - pglXQueryDrawable(object->display, object->drawable, GLX_WIDTH, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->drawable, GLX_WIDTH, (unsigned int*) piValue); wine_tsx11_unlock(); break; case WGL_PBUFFER_HEIGHT_ARB: wine_tsx11_lock(); - pglXQueryDrawable(object->display, object->drawable, GLX_HEIGHT, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->drawable, GLX_HEIGHT, (unsigned int*) piValue); wine_tsx11_unlock(); break; @@ -2757,7 +2746,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) opengl_funcs.gl.p_glCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); /* Switch back to the original drawable and upload the pbuffer-texture */ - pglXMakeCurrent(object->display, prev_drawable, prev_context); + pglXMakeCurrent(gdi_display, prev_drawable, prev_context); pglXDestroyContext(gdi_display, tmp_context); wine_tsx11_unlock(); return GL_TRUE;

1 0

Alexandre Julliard : winex11: Get rid of the glGetIntegerv wrapper.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 72e873873e1549e9b3a23d726552264a7ba51f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e873873e1549e9b3a23d726… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 13:21:20 2012 +0200 winex11: Get rid of the glGetIntegerv wrapper. --- dlls/winex11.drv/opengl.c | 42 +----------------------------------------- 1 files changed, 1 insertions(+), 41 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5d1c5a8..c4b364e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -316,11 +316,9 @@ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, /* Standard OpenGL */ static void (*pglFinish)(void); static void (*pglFlush)(void); -static void (*pglGetIntegerv)(GLenum,GLint*); static void wglFinish(void); static void wglFlush(void); -static void wglGetIntegerv(GLenum pname, GLint* params); static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { @@ -494,7 +492,6 @@ static BOOL has_opengl(void) do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = w##func; } while(0) REDIRECT( glFinish ); REDIRECT( glFlush ); - REDIRECT( glGetIntegerv ); #undef REDIRECT pglXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0); @@ -1730,43 +1727,6 @@ static HDC glxdrv_wglGetCurrentDC( struct wgl_context *ctx ) return ctx->hdc; } -/* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ -static void wglGetIntegerv(GLenum pname, GLint* params) -{ - wine_tsx11_lock(); - switch(pname) - { - case GL_DEPTH_BITS: - { - struct wgl_context *ctx = NtCurrentTeb()->glContext; - - pglGetIntegerv(pname, params); - /** - * if we cannot find a Wine Context - * we only have the default wine desktop context, - * so if we have only a 24 depth say we have 32 - */ - if (!ctx && *params == 24) { - *params = 32; - } - TRACE("returns GL_DEPTH_BITS as '%d'\n", *params); - break; - } - case GL_ALPHA_BITS: - { - struct wgl_context *ctx = NtCurrentTeb()->glContext; - - pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_ALPHA_SIZE, params); - TRACE("returns GL_ALPHA_BITS as '%d'\n", *params); - break; - } - default: - pglGetIntegerv(pname, params); - break; - } - wine_tsx11_unlock(); -} - static void flush_pixmap( struct wgl_context *ctx ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -2735,7 +2695,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); - pglGetIntegerv(object->texture_bind_target, &prev_binded_texture); + opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); /* Switch to our pbuffer */ pglXMakeCurrent(gdi_display, object->drawable, tmp_context);

1 0

Nozomi Kodama : d3dx9_36: Add some traces.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 3c278d7ec3ee7394a918e0fa9af6e7a95c3accea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c278d7ec3ee7394a918e0fa9… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Fri Jul 20 04:32:50 2012 +0800 d3dx9_36: Add some traces. --- dlls/d3dx9_36/math.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c278d7ec3ee7394a918e…

1 0

Henri Verbeet : wined3d: Get rid of some unused PCI IDs.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 15b41f01816d0e2d7e2816f05cc4b2d2ad2e1f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b41f01816d0e2d7e2816f05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 20 00:24:26 2012 +0200 wined3d: Get rid of some unused PCI IDs. In case of e.g. CARD_AMD_RADEON_HD4650 and CARD_AMD_RADEON_HD4670 these are wrong too, because you can't distinguish one HD46xx card from another based on PCI ID. --- dlls/wined3d/wined3d_private.h | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc9523f..70245a7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1315,25 +1315,13 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD2900 = 0x9400, CARD_AMD_RADEON_HD3200 = 0x9620, CARD_AMD_RADEON_HD4350 = 0x954f, - CARD_AMD_RADEON_HD4550 = 0x9540, CARD_AMD_RADEON_HD4600 = 0x9495, - CARD_AMD_RADEON_HD4650 = 0x9498, - CARD_AMD_RADEON_HD4670 = 0x9490, CARD_AMD_RADEON_HD4700 = 0x944e, - CARD_AMD_RADEON_HD4770 = 0x94b3, - CARD_AMD_RADEON_HD4800 = 0x944c, /* Picked one value between 9440, 944c, 9442, 9460 */ - CARD_AMD_RADEON_HD4830 = 0x944c, - CARD_AMD_RADEON_HD4850 = 0x9442, - CARD_AMD_RADEON_HD4870 = 0x9440, - CARD_AMD_RADEON_HD4890 = 0x9460, + CARD_AMD_RADEON_HD4800 = 0x944c, CARD_AMD_RADEON_HD5400 = 0x68f9, CARD_AMD_RADEON_HD5600 = 0x68d8, - CARD_AMD_RADEON_HD5700 = 0x68BE, /* Picked HD5750 */ - CARD_AMD_RADEON_HD5750 = 0x68BE, - CARD_AMD_RADEON_HD5770 = 0x68B8, - CARD_AMD_RADEON_HD5800 = 0x6898, /* Picked HD5850 */ - CARD_AMD_RADEON_HD5850 = 0x6898, - CARD_AMD_RADEON_HD5870 = 0x6899, + CARD_AMD_RADEON_HD5700 = 0x68be, + CARD_AMD_RADEON_HD5800 = 0x6898, CARD_AMD_RADEON_HD5900 = 0x689c, CARD_AMD_RADEON_HD6300 = 0x9803, CARD_AMD_RADEON_HD6400 = 0x6770, @@ -1365,7 +1353,6 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, - CARD_NVIDIA_GEFORCE_8100 = 0x084F, CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084B */ CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8400GS = 0x0404,

1 0

Henri Verbeet : wined3d: Convert some uppercase hex constants to lowercase.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: ea8dfe640db7fcba8d7904ba70a971183a2a23b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8dfe640db7fcba8d7904ba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 20 00:24:27 2012 +0200 wined3d: Convert some uppercase hex constants to lowercase. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 16 ++++++++-------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 29 +++++++++++++++-------------- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ed6230..332e0d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3337,7 +3337,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO warned = TRUE; } - *( (DWORD *) dest_ptr) = 0xFF000000; + *(DWORD *)dest_ptr = 0xff000000; dest_ptr += sizeof(DWORD); } else diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7aa2d25..2a6b83b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4914,8 +4914,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DVTXPCAPS_VERTEXFOG | WINED3DVTXPCAPS_TEXGEN; - caps->MaxPrimitiveCount = 0xFFFFF; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ - caps->MaxVertexIndex = 0xFFFFF; + caps->MaxPrimitiveCount = 0xfffff; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ + caps->MaxVertexIndex = 0xfffff; caps->MaxStreams = MAX_STREAMS; caps->MaxStreamStride = 1024; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ce239b4..f4a9f13 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -586,7 +586,7 @@ static void shaderconstant(struct wined3d_context *context, const struct wined3d static void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD enable = 0xFFFFFFFF; + DWORD enable = 0xffffffff; DWORD disable = 0x00000000; if (use_vs(state)) @@ -3819,7 +3819,7 @@ static void transform_worldex(struct wined3d_context *context, const struct wine * GL_MODELVIEW2_ARB: 0x8722 * GL_MODELVIEW3_ARB: 0x8723 * etc - * GL_MODELVIEW31_ARB: 0x873F + * GL_MODELVIEW31_ARB: 0x873f */ if(matrix == 1) glMat = GL_MODELVIEW1_ARB; else glMat = GL_MODELVIEW2_ARB - 2 + matrix; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a09c2f9..9660f2e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1228,7 +1228,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; - state->render_states[WINED3D_RS_BLENDFACTOR] = 0xFFFFFFFF; + state->render_states[WINED3D_RS_BLENDFACTOR] = 0xffffffff; state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0; state->render_states[WINED3D_RS_DEPTHBIAS] = 0; state->render_states[WINED3D_RS_WRAP8] = 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5eb4085..49c0f33 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3820,9 +3820,9 @@ do { \ BYTE *d = buf; for (x = 0; x < width; ++x, d += 3) { - d[0] = (color ) & 0xFF; - d[1] = (color >> 8) & 0xFF; - d[2] = (color >> 16) & 0xFF; + d[0] = (color ) & 0xff; + d[1] = (color >> 8) & 0xff; + d[2] = (color >> 16) & 0xff; } break; } @@ -4635,7 +4635,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 else if (pal->flags & WINEDDPCAPS_ALPHA) table[i][3] = pal->palents[i].peFlags; else - table[i][3] = 0xFF; + table[i][3] = 0xff; } } } @@ -4704,7 +4704,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI Dest = (WORD *) (dst + y * outpitch); for (x = 0; x < width; x++ ) { WORD color = *Source++; - *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); + *Dest = ((color & 0xffc0) | ((color & 0x1f) << 1)); if (!color_in_range(&surface->src_blt_color_key, color)) *Dest |= 0x0001; Dest++; @@ -6757,7 +6757,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * case BLACKNESS: hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, 0); break; - case 0xAA0029: /* No-op */ + case 0xaa0029: /* No-op */ break; case WHITENESS: hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, ~0U); @@ -6916,8 +6916,8 @@ do { \ else { LONG dstyinc = dst_map.row_pitch, dstxinc = bpp; - DWORD keylow = 0xFFFFFFFF, keyhigh = 0, keymask = 0xFFFFFFFF; - DWORD destkeylow = 0x0, destkeyhigh = 0xFFFFFFFF, destkeymask = 0xFFFFFFFF; + DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff; + DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff; if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE)) { /* The color keying flags are checked for correctness in ddraw */ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index f3b42ff..ff8c07c 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -315,7 +315,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_ BOOL has_specular = !!(fvf & WINED3DFVF_SPECULAR); DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; - DWORD texcoords = (fvf & 0xFFFF0000) >> 16; + DWORD texcoords = (fvf & 0xffff0000) >> 16; struct wined3d_fvf_convert_state state; unsigned int size; unsigned int idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70245a7..38f4147 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -187,10 +187,11 @@ static inline GLenum wined3d_gl_min_mip_filter(const struct min_lookup min_mip_l * * See GL_NV_half_float for a reference of the FLOAT16 / GL_HALF format */ -static inline float float_16_to_32(const unsigned short *in) { +static inline float float_16_to_32(const unsigned short *in) +{ const unsigned short s = ((*in) & 0x8000); - const unsigned short e = ((*in) & 0x7C00) >> 10; - const unsigned short m = (*in) & 0x3FF; + const unsigned short e = ((*in) & 0x7c00) >> 10; + const unsigned short m = (*in) & 0x3ff; const float sgn = (s ? -1.0f : 1.0f); if(e == 0) { @@ -800,15 +801,15 @@ extern int num_lock DECLSPEC_HIDDEN; /* ------------------ */ #define GL_EXTCALL(f) (gl_info->f) -#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) -#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) -#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xFF) -#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xFF) +#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff) +#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff) +#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xff) +#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xff) -#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xFF)) / 255.0f) -#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xFF)) / 255.0f) -#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xFF)) / 255.0f) -#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xFF)) / 255.0f) +#define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xff)) / 255.0f) +#define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xff)) / 255.0f) +#define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xff)) / 255.0f) +#define D3DCOLOR_A(dw) (((float) (((dw) >> 24) & 0xff)) / 255.0f) #define D3DCOLORTOGLFLOAT4(dw, vec) do { \ (vec)[0] = D3DCOLOR_R(dw); \ @@ -1329,10 +1330,10 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600M = 0x6741, - CARD_AMD_RADEON_HD6700 = 0x68BA, + CARD_AMD_RADEON_HD6700 = 0x68ba, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719, - CARD_AMD_RADEON_HD7900 = 0x679A, + CARD_AMD_RADEON_HD7900 = 0x679a, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, @@ -1353,7 +1354,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, - CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084B */ + CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084b */ CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8400GS = 0x0404, CARD_NVIDIA_GEFORCE_8500GT = 0x0421,

1 0

Alexandre Julliard : opengl32: Add supported wgl extension functions to the OpenGL function table.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 1b9455e65d169ebff45c7c2fccab66dc5942e4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9455e65d169ebff45c7c2fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 00:00:55 2012 +0200 opengl32: Add supported wgl extension functions to the OpenGL function table. --- dlls/opengl32/make_opengl | 121 +++++++++++----- dlls/opengl32/opengl_ext.c | 32 ++++- dlls/opengl32/opengl_ext.h | 3 + dlls/opengl32/opengl_norm.c | 4 - dlls/opengl32/wgl.c | 328 +++++++++++++++++++++++++++++++++++++------ dlls/winex11.drv/opengl.c | 306 +++++++++++------------------------------ include/wine/wgl_driver.h | 25 +++- 7 files changed, 501 insertions(+), 318 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b9455e65d169ebff45c7…

1 0

Alexandre Julliard : opengl32: Move the wgl functions to the main OpenGL function table.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 4c0779006efa0f491d13c6df42b26bb44258ff51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0779006efa0f491d13c6df4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 23:58:41 2012 +0200 opengl32: Move the wgl functions to the main OpenGL function table. --- dlls/gdi32/driver.c | 73 +----------------------------------------- dlls/gdi32/opengl.c | 4 +- dlls/opengl32/make_opengl | 46 ++++++++++++++++++++++++-- dlls/opengl32/opengl_norm.c | 28 +++++++++++++++- dlls/opengl32/wgl.c | 56 +++++++++++++++++--------------- dlls/wined3d/directx.c | 10 ++++-- dlls/winex11.drv/opengl.c | 41 ++++++++++++------------ include/wine/gdi_driver.h | 26 ++------------- include/wine/wgl_driver.h | 20 +++++++++++- 9 files changed, 152 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c0779006efa0f491d13c…

1 0

Alexandre Julliard : opengl32: Declare input pointers as const in function prototypes.
by Alexandre Julliard July 20, 2012

July 20, 2012

Module: wine Branch: master Commit: 782e96b910ca2c90b2518c14db7f6c9358eef010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782e96b910ca2c90b2518c14d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 22:17:14 2012 +0200 opengl32: Declare input pointers as const in function prototypes. --- dlls/opengl32/make_opengl | 5 +- dlls/opengl32/opengl_ext.c | 1626 +++++++++++++++++++------------------- dlls/opengl32/opengl_norm.c | 484 ++++++------ include/wine/wgl_driver.h | 1868 +++++++++++++++++++++--------------------- 4 files changed, 1992 insertions(+), 1991 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=782e96b910ca2c90b2518…

1 0

Alexandre Julliard : gdi32: Remove left-over debug trace.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 6a8ded433bcabee8b50b333c161aa3387d688cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8ded433bcabee8b50b333c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 20:27:39 2012 +0200 gdi32: Remove left-over debug trace. --- dlls/gdi32/dibdrv/objects.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index b3f058d..04548ce 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1991,10 +1991,6 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, static BOOL null_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { - if (rop == 1) - { - ERR("(%p, %s, BLACKNESS)\n", pdev, wine_dbgstr_rect(rects)); - } return TRUE; }

1 0