wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_npatch_mode() const.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: a9fcaed6105bdbb75f0689317e0cc5cd2e616ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fcaed6105bdbb75f0689317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:09 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_npatch_mode() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4509d93..20bf808 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4613,7 +4613,7 @@ HRESULT CDECL wined3d_device_set_npatch_mode(struct wined3d_device *device, floa return WINED3D_OK; } -float CDECL wined3d_device_get_npatch_mode(struct wined3d_device *device) +float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) { static BOOL warned; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 92d7d4d..e466400 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2224,7 +2224,7 @@ HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *dev HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable); HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, WINED3DMATERIAL *material); -float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); +float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_raster_status() const.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 39f898b26a5985e35fd776641c827a901abc625d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f898b26a5985e35fd776641… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:08 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_raster_status() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec9126f..4509d93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4568,7 +4568,7 @@ BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_de return device->softwareVertexProcessing; } -HRESULT CDECL wined3d_device_get_raster_status(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c6949bd..92d7d4d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2234,7 +2234,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_raster_status(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value);

1 0

Henri Verbeet : wined3d: Cleanup context_create() error handling a bit.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 7ffa768e712420576728777f5919eac5a8daedc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffa768e712420576728777f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:07 2011 +0200 wined3d: Cleanup context_create() error handling a bit. --- dlls/wined3d/context.c | 123 ++++++++++++++++++++++++++--------------------- 1 files changed, 68 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 61398e6..9d15176 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1311,6 +1311,53 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, return NULL; } + if (device->shader_backend->shader_dirtifyable_constants()) + { + /* Create the dirty constants array and initialize them to dirty */ + ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, + sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); + if (!ret->vshader_const_dirty) + goto out; + + ret->pshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, + sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); + if (!ret->pshader_const_dirty) + goto out; + + memset(ret->vshader_const_dirty, 1, + sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); + memset(ret->pshader_const_dirty, 1, + sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); + } + + ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->blit_targets)); + if (!ret->blit_targets) + goto out; + + ret->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->draw_buffers)); + if (!ret->draw_buffers) + goto out; + + ret->free_occlusion_query_size = 4; + ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, + ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); + if (!ret->free_occlusion_queries) + goto out; + + list_init(&ret->occlusion_queries); + + ret->free_event_query_size = 4; + ret->free_event_queries = HeapAlloc(GetProcessHeap(), 0, + ret->free_event_query_size * sizeof(*ret->free_event_queries)); + if (!ret->free_event_queries) + goto out; + + list_init(&ret->event_queries); + list_init(&ret->fbo_list); + list_init(&ret->fbo_destroy_list); + if (!(hdc = GetDC(swapchain->win_handle))) { WARN("Failed to retireve device context, trying swapchain backup.\n"); @@ -1362,36 +1409,41 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } + context_enter(ret); + if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + context_release(ret); + goto out; + } + + if (!(ctx = pwglCreateContext(hdc))) + { + ERR("Failed to create a WGL context.\n"); + context_release(ret); goto out; } - ctx = pwglCreateContext(hdc); if (device->context_count) { if (!pwglShareLists(device->contexts[0]->glCtx, ctx)) { - DWORD err = GetLastError(); ERR("wglShareLists(%p, %p) failed, last error %#x.\n", - device->contexts[0]->glCtx, ctx, err); + device->contexts[0]->glCtx, ctx, GetLastError()); + context_release(ret); + if (!pwglDeleteContext(ctx)) + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); + goto out; } } - if(!ctx) { - ERR("Failed to create a WGL context\n"); - goto out; - } - if (!device_context_add(device, ret)) { ERR("Failed to add the newly created context to the context list\n"); + context_release(ret); if (!pwglDeleteContext(ctx)) - { - DWORD err = GetLastError(); - ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, err); - } + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); goto out; } @@ -1419,53 +1471,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->hdc = hdc; ret->pixel_format = pixel_format; - if (device->shader_backend->shader_dirtifyable_constants()) - { - /* Create the dirty constants array and initialize them to dirty */ - ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, - sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); - ret->pshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, - sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); - memset(ret->vshader_const_dirty, 1, - sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); - memset(ret->pshader_const_dirty, 1, - sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); - } - - ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - gl_info->limits.buffers * sizeof(*ret->blit_targets)); - if (!ret->blit_targets) goto out; - - ret->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - gl_info->limits.buffers * sizeof(*ret->draw_buffers)); - if (!ret->draw_buffers) goto out; - - ret->free_occlusion_query_size = 4; - ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, - ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); - if (!ret->free_occlusion_queries) goto out; - - list_init(&ret->occlusion_queries); - - ret->free_event_query_size = 4; - ret->free_event_queries = HeapAlloc(GetProcessHeap(), 0, - ret->free_event_query_size * sizeof(*ret->free_event_queries)); - if (!ret->free_event_queries) goto out; - - list_init(&ret->event_queries); - - TRACE("Successfully created new context %p\n", ret); - - list_init(&ret->fbo_list); - list_init(&ret->fbo_destroy_list); - - context_enter(ret); - /* Set up the context defaults */ if (!context_set_current(ret)) { - ERR("Cannot activate context to set up defaults\n"); + ERR("Cannot activate context to set up defaults.\n"); + device_context_remove(device, ret); context_release(ret); + if (!pwglDeleteContext(ctx)) + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); goto out; }

1 0

Henri Verbeet : wined3d: Get rid of the mostly unused "pfd" variable in context_create().
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 67b097cd6e92567d0335bc8894c87eaaca3bc5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b097cd6e92567d0335bc889… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:06 2011 +0200 wined3d: Get rid of the mostly unused "pfd" variable in context_create(). --- dlls/wined3d/context.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e44ee81..61398e6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1294,7 +1294,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; - PIXELFORMATDESCRIPTOR pfd; BOOL auxBuffers = FALSE; int pixel_format; unsigned int s; @@ -1363,7 +1362,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - DescribePixelFormat(hdc, pixel_format, sizeof(pfd), &pfd); if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc);

1 0

Henri Verbeet : gameux: Don't shadow hr in GAMEUX_RegisterGame().
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: a4ee6226ae4ecbf921a4dac2060c796f1b1ad5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee6226ae4ecbf921a4dac20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:05 2011 +0200 gameux: Don't shadow hr in GAMEUX_RegisterGame(). --- dlls/gameux/gameexplorer.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index c6935c9..bada386 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -565,7 +565,6 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, { struct parse_gdf_thread_param thread_param; HANDLE thread; - HRESULT hr; DWORD ret; thread_param.GameData = &GameData;

1 0

Alexandre Julliard : gdi32/tests: Add more tests for various palette formats as destination.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: deb195869ca3d02d1cac6c0d9dab85ea8d27b0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb195869ca3d02d1cac6c0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 23:14:48 2011 +0200 gdi32/tests: Add more tests for various palette formats as destination. --- dlls/gdi32/tests/dib.c | 255 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 249 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=deb195869ca3d02d1cac6…

1 0

Alexandre Julliard : gdi32/tests: Add more tests for arbitrary 32-bpp bitfields as destination.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 5500e97d192bae4e15bfbef097a0d9274b6244cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5500e97d192bae4e15bfbef09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 13:06:49 2011 +0200 gdi32/tests: Add more tests for arbitrary 32-bpp bitfields as destination. --- dlls/gdi32/tests/dib.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 167 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5500e97d192bae4e15bfb…

1 0

Alexandre Julliard : gdi32/tests: Add tests for DIB conversions from various source formats.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 1af12ff9b598cd67cd70a9bc1ea2faf7424e3a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af12ff9b598cd67cd70a9bc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 22:32:25 2011 +0200 gdi32/tests: Add tests for DIB conversions from various source formats. --- dlls/gdi32/tests/dib.c | 283 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 262 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1af12ff9b598cd67cd70a…

1 0

Alexandre Julliard : gdi32: Use a reduced precision for RGB to palette mapping in DIB conversions.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: a9be526a9c81f43eabc43fedf4dad721e1fee3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9be526a9c81f43eabc43fedf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 00:47:05 2011 +0200 gdi32: Use a reduced precision for RGB to palette mapping in DIB conversions. --- dlls/gdi32/dibdrv/primitives.c | 70 +++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index da009a2..7322686 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -2404,6 +2404,12 @@ static inline BOOL color_tables_match(const dib_info *d1, const dib_info *d2) return !memcmp(d1->color_table, d2->color_table, d1->color_table_size * sizeof(d1->color_table[0])); } +static inline DWORD rgb_lookup_colortable(const dib_info *dst, BYTE r, BYTE g, BYTE b) +{ + /* Windows reduces precision to 5 bits, probably in order to build some sort of lookup cache */ + return rgb_to_pixel_colortable( dst, (r & ~7) + 4, (g & ~7) + 4, (b & ~7) + 4 ); +} + static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_8(dst, 0, 0), *dst_pixel; @@ -2425,7 +2431,7 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, src_val >> 16, src_val >> 8, src_val ); + *dst_pixel++ = rgb_lookup_colortable(dst, src_val >> 16, src_val >> 8, src_val ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2441,10 +2447,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - src_val >> src->red_shift, - src_val >> src->green_shift, - src_val >> src->blue_shift ); + *dst_pixel++ = rgb_lookup_colortable(dst, + src_val >> src->red_shift, + src_val >> src->green_shift, + src_val >> src->blue_shift ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2460,10 +2466,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - get_field(src_val, src->red_shift, src->red_len), - get_field(src_val, src->green_shift, src->green_len), - get_field(src_val, src->blue_shift, src->blue_len)); + *dst_pixel++ = rgb_lookup_colortable(dst, + get_field(src_val, src->red_shift, src->red_len), + get_field(src_val, src->green_shift, src->green_len), + get_field(src_val, src->blue_shift, src->blue_len)); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2483,7 +2489,7 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec src_pixel = src_start; for(x = src_rect->left; x < src_rect->right; x++, src_pixel += 3) { - *dst_pixel++ = rgb_to_pixel_colortable(dst, src_pixel[2], src_pixel[1], src_pixel[0] ); + *dst_pixel++ = rgb_lookup_colortable(dst, src_pixel[2], src_pixel[1], src_pixel[0] ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2504,10 +2510,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - ((src_val >> 7) & 0xf8) | ((src_val >> 12) & 0x07), - ((src_val >> 2) & 0xf8) | ((src_val >> 7) & 0x07), - ((src_val << 3) & 0xf8) | ((src_val >> 2) & 0x07) ); + *dst_pixel++ = rgb_lookup_colortable(dst, + ((src_val >> 7) & 0xf8) | ((src_val >> 12) & 0x07), + ((src_val >> 2) & 0xf8) | ((src_val >> 7) & 0x07), + ((src_val << 3) & 0xf8) | ((src_val >> 2) & 0x07) ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2523,13 +2529,13 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - (((src_val >> src->red_shift) << 3) & 0xf8) | - (((src_val >> src->red_shift) >> 2) & 0x07), - (((src_val >> src->green_shift) << 3) & 0xf8) | - (((src_val >> src->green_shift) >> 2) & 0x07), - (((src_val >> src->blue_shift) << 3) & 0xf8) | - (((src_val >> src->blue_shift) >> 2) & 0x07) ); + *dst_pixel++ = rgb_lookup_colortable(dst, + (((src_val >> src->red_shift) << 3) & 0xf8) | + (((src_val >> src->red_shift) >> 2) & 0x07), + (((src_val >> src->green_shift) << 3) & 0xf8) | + (((src_val >> src->green_shift) >> 2) & 0x07), + (((src_val >> src->blue_shift) << 3) & 0xf8) | + (((src_val >> src->blue_shift) >> 2) & 0x07) ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2545,13 +2551,13 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - (((src_val >> src->red_shift) << 3) & 0xf8) | - (((src_val >> src->red_shift) >> 2) & 0x07), - (((src_val >> src->green_shift) << 2) & 0xfc) | - (((src_val >> src->green_shift) >> 4) & 0x03), - (((src_val >> src->blue_shift) << 3) & 0xf8) | - (((src_val >> src->blue_shift) >> 2) & 0x07) ); + *dst_pixel++ = rgb_lookup_colortable(dst, + (((src_val >> src->red_shift) << 3) & 0xf8) | + (((src_val >> src->red_shift) >> 2) & 0x07), + (((src_val >> src->green_shift) << 2) & 0xfc) | + (((src_val >> src->green_shift) >> 4) & 0x03), + (((src_val >> src->blue_shift) << 3) & 0xf8) | + (((src_val >> src->blue_shift) >> 2) & 0x07) ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2567,10 +2573,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - get_field(src_val, src->red_shift, src->red_len), - get_field(src_val, src->green_shift, src->green_len), - get_field(src_val, src->blue_shift, src->blue_len)); + *dst_pixel++ = rgb_lookup_colortable(dst, + get_field(src_val, src->red_shift, src->red_len), + get_field(src_val, src->green_shift, src->green_len), + get_field(src_val, src->blue_shift, src->blue_len)); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride;

1 0

Dylan Smith : d3dx9: Removed a duplicate NULL check.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 8f8e86eaa35af2c20589fa1933e82ef3c62b2958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8e86eaa35af2c20589fa193… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 13 09:12:55 2011 -0400 d3dx9: Removed a duplicate NULL check. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6e1433e..2460373 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3444,7 +3444,7 @@ HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc current_frame = frame->pFrameSibling; frame->pFrameSibling = current_frame->pFrameSibling; current_frame->pFrameSibling = NULL; - } else if (frame) { + } else { current_frame = frame; last = TRUE; }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011