wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Alexandre Julliard : server: Set the initial thread affinity from the process.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 9ce56b272948592942ccfe2555048d52fe813785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce56b272948592942ccfe255… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 15:58:25 2010 +0100 server: Set the initial thread affinity from the process. --- server/thread.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/thread.c b/server/thread.c index 148ca3b..bdb6c3c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -222,6 +222,7 @@ struct thread *create_thread( int fd, struct process *process ) thread->process = (struct process *)grab_object( process ); thread->desktop = process->desktop; + thread->affinity = process->affinity; if (!current) current = thread; list_add_head( &thread_list, &thread->entry );

1 0

Alexandre Julliard : server: Allow changing a thread affinity before it is initialized.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 2f3fa8596bc6410a3b535e2f12bf551841334ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3fa8596bc6410a3b535e2f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 15:58:02 2010 +0100 server: Allow changing a thread affinity before it is initialized. --- server/thread.c | 28 ++++++++++++++-------------- server/thread.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/server/thread.c b/server/thread.c index b50193a..148ca3b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -407,13 +407,9 @@ struct thread *get_thread_from_pid( int pid ) return NULL; } -void set_thread_affinity( struct thread *thread, affinity_t affinity ) +int set_thread_affinity( struct thread *thread, affinity_t affinity ) { - if ((affinity & thread->process->affinity) != affinity) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } + int ret = 0; #ifdef HAVE_SCHED_SETAFFINITY if (thread->unix_tid != -1) { @@ -425,15 +421,11 @@ void set_thread_affinity( struct thread *thread, affinity_t affinity ) for (i = 0, mask = 1; mask; i++, mask <<= 1) if (affinity & mask) CPU_SET( i, &set ); - if (!sched_setaffinity( thread->unix_tid, sizeof(set), &set )) - thread->affinity = affinity; - else - file_set_error(); + ret = sched_setaffinity( thread->unix_tid, sizeof(set), &set ); } - else set_error( STATUS_ACCESS_DENIED ); -#else - thread->affinity = affinity; #endif + if (!ret) thread->affinity = affinity; + return ret; } #define THREAD_PRIORITY_REALTIME_HIGHEST 6 @@ -460,7 +452,14 @@ static void set_thread_info( struct thread *thread, set_error( STATUS_INVALID_PARAMETER ); } if (req->mask & SET_THREAD_INFO_AFFINITY) - set_thread_affinity( thread, req->affinity ); + { + if ((req->affinity & thread->process->affinity) != req->affinity) + set_error( STATUS_INVALID_PARAMETER ); + else if (thread->state == TERMINATED) + set_error( STATUS_ACCESS_DENIED ); + else if (set_thread_affinity( thread, req->affinity )) + file_set_error(); + } if (req->mask & SET_THREAD_INFO_TOKEN) security_set_thread_token( thread, req->token ); } @@ -1158,6 +1157,7 @@ DECL_HANDLER(init_thread) generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); } debug_level = max( debug_level, req->debug_level ); + set_thread_affinity( current, current->affinity ); reply->pid = get_process_id( process ); reply->tid = get_thread_id( current ); diff --git a/server/thread.h b/server/thread.h index 90f6061..1e95732 100644 --- a/server/thread.h +++ b/server/thread.h @@ -118,7 +118,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); -extern void set_thread_affinity( struct thread *thread, affinity_t affinity ); +extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); /* ptrace functions */

1 0

Paul Chitescu : uuid.h: Added standard qedit CLSID_SampleGrabber.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: b2a8cca6cde2f1356ae8a02c09259a4b7a8c77b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a8cca6cde2f1356ae8a02c0… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Feb 2 14:32:27 2010 +0200 uuid.h: Added standard qedit CLSID_SampleGrabber. --- include/uuids.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/uuids.h b/include/uuids.h index 54a30fc..376cca7 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -135,6 +135,7 @@ OUR_GUID_ENTRY(CLSID_WAVEParser, 0xd51bd5a1, 0x7548, 0x11cf, OUR_GUID_ENTRY(CLSID_QTDec, 0xfdfe9681, 0x74a3, 0x11d0, 0xaf, 0xa7, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) OUR_GUID_ENTRY(CLSID_AVIDoc, 0xd3588ab0, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) OUR_GUID_ENTRY(CLSID_AVIDocWriter, 0xd3588ab1, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) +OUR_GUID_ENTRY(CLSID_SampleGrabber, 0xc1f400a0, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) OUR_GUID_ENTRY(CLSID_NullRenderer, 0xc1f400a4, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) OUR_GUID_ENTRY(CLSID_VideoRenderer, 0x70e102b0, 0x5556, 0x11ce, 0x97, 0xc0, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) OUR_GUID_ENTRY(CLSID_VideoRendererDefault, 0x6bc1cffa, 0x8fc1, 0x4261, 0xac, 0x22, 0xcf, 0xb4, 0xcc, 0x38, 0xdb, 0x50)

1 0

Paul Chitescu : qcap: Test the correct variable when deciding how to grab V4L frame.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: d643748c9433654c71b2727e8e7a1b17b96d1b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d643748c9433654c71b2727e8… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Feb 2 13:33:54 2010 +0200 qcap: Test the correct variable when deciding how to grab V4L frame. --- dlls/qcap/v4l.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 85d4d4d..91dd8f4 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -563,7 +563,7 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) static void V4l_GetFrame(Capture * capBox, unsigned char ** pInput) { - if (capBox->pmap) + if (capBox->mmap) { if (xioctl(capBox->fd, VIDIOCSYNC, &capBox->grab_buf[capBox->curframe]) == -1) WARN("Syncing ioctl failed: %d\n", errno);

1 0

Henri Verbeet : wined3d: Select the shader backend during adapter initialization.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: cee8e9d88189e291e0e45524122f5d5dff594c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee8e9d88189e291e0e455241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:57 2010 +0100 wined3d: Select the shader backend during adapter initialization. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 22 ++++++++++++++-------- dlls/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1bec60c..56e970d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6924,7 +6924,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); - device->shader_backend = select_shader_backend(adapter, device_type); + device->shader_backend = adapter->shader_backend; memset(&shader_caps, 0, sizeof(shader_caps)); device->shader_backend->shader_get_caps(device_type, &adapter->gl_info, &shader_caps); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5cb633d..c9d3f90 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1645,6 +1645,16 @@ static const struct fragment_pipeline *select_fragment_implementation(struct win else return &ffp_fragment_pipeline; } +static const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter) +{ + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; + if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; + return &none_shader_backend; +} + /* Context activation is done by the caller. */ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { @@ -2084,6 +2094,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) LEAVE_GL(); adapter->fragment_pipe = select_fragment_implementation(adapter); + adapter->shader_backend = select_shader_backend(adapter); /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment @@ -2990,7 +3001,6 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType, const struct GlPixelFormatDesc *format_desc) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; - const shader_backend_t *shader_backend; switch (format_desc->format) { @@ -3068,8 +3078,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, /* Ask the shader backend if it can deal with the conversion. If * we've got a GL extension giving native support this will be an * identity conversion. */ - shader_backend = select_shader_backend(adapter, DeviceType); - if (shader_backend->shader_color_fixup_supported(format_desc->color_fixup)) + if (adapter->shader_backend->shader_color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -3185,8 +3194,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { - shader_backend = select_shader_backend(adapter, DeviceType); - if (shader_backend->shader_color_fixup_supported(format_desc->color_fixup) + if (adapter->shader_backend->shader_color_fixup_supported(format_desc->color_fixup) && adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); @@ -3826,7 +3834,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, int ps_selected_mode; struct shader_caps shader_caps; struct fragment_caps fragment_caps; - const shader_backend_t *shader_backend; DWORD ckey_caps, blit_caps, fx_caps; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -4203,8 +4210,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->VertexTextureFilterCaps = 0; memset(&shader_caps, 0, sizeof(shader_caps)); - shader_backend = select_shader_backend(adapter, DeviceType); - shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); + adapter->shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); memset(&fragment_caps, 0, sizeof(fragment_caps)); adapter->fragment_pipe->get_caps(DeviceType, &adapter->gl_info, &fragment_caps); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 318d75d..5e6da24 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2841,16 +2841,6 @@ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, else *ps_selected = SHADER_NONE; } -const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) -{ - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; - if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; - return &none_shader_backend; -} - const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 038fa3f..fca1a9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1364,6 +1364,7 @@ struct wined3d_adapter LUID luid; const struct fragment_pipeline *fragment_pipe; + const shader_backend_t *shader_backend; }; BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; @@ -2570,8 +2571,6 @@ unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; -const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN; typedef struct local_constant {

1 0

Henri Verbeet : wined3d: Select the fragment pipeline during adapter initialization.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: fb21551b2d87a179a6463aae146b43035eb53c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb21551b2d87a179a6463aae1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:56 2010 +0100 wined3d: Select the fragment pipeline during adapter initialization. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 36 ++++++++++++++++++++++++------------ dlls/wined3d/utils.c | 16 ---------------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 02c468f..1bec60c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6933,7 +6933,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->vs_clipping = shader_caps.VSClipping; memset(&ffp_caps, 0, sizeof(ffp_caps)); - fragment_pipeline = select_fragment_implementation(adapter, device_type); + fragment_pipeline = adapter->fragment_pipe; device->frag_pipe = fragment_pipeline; fragment_pipeline->get_caps(device_type, &adapter->gl_info, &ffp_caps); device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e98292..5cb633d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1630,9 +1630,26 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * } } +static const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter) +{ + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); + if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) + && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; + else if (ps_selected_mode == SHADER_ATI) return &atifs_fragment_pipeline; + else if (gl_info->supported[NV_REGISTER_COMBINERS] + && gl_info->supported[NV_TEXTURE_SHADER2]) return &nvts_fragment_pipeline; + else if (gl_info->supported[NV_REGISTER_COMBINERS]) return &nvrc_fragment_pipeline; + else return &ffp_fragment_pipeline; +} + /* Context activation is done by the caller. */ -static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, struct wined3d_gl_info *gl_info) +static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { + struct wined3d_driver_info *driver_info = &adapter->driver_info; + struct wined3d_gl_info *gl_info = &adapter->gl_info; const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; const char *gl_string = NULL; @@ -2066,6 +2083,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str LEAVE_GL(); + adapter->fragment_pipe = select_fragment_implementation(adapter); + /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment * shaders), but 8 texture stages (register combiners). */ @@ -2771,8 +2790,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType, const struct GlPixelFormatDesc *format_desc) { - const struct fragment_pipeline *fp; - switch(format_desc->format) { case WINED3DFMT_R8G8_SNORM: @@ -2783,8 +2800,7 @@ static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, /* Ask the fixed function pipeline implementation if it can deal * with the conversion. If we've got a GL extension giving native * support this will be an identity conversion. */ - fp = select_fragment_implementation(adapter, DeviceType); - if (fp->color_fixup_supported(format_desc->color_fixup)) + if (adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -2975,7 +2991,6 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, { const struct wined3d_gl_info *gl_info = &adapter->gl_info; const shader_backend_t *shader_backend; - const struct fragment_pipeline *fp; switch (format_desc->format) { @@ -3171,9 +3186,8 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { shader_backend = select_shader_backend(adapter, DeviceType); - fp = select_fragment_implementation(adapter, DeviceType); if (shader_backend->shader_color_fixup_supported(format_desc->color_fixup) - && fp->color_fixup_supported(format_desc->color_fixup)) + && adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -3813,7 +3827,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, struct shader_caps shader_caps; struct fragment_caps fragment_caps; const shader_backend_t *shader_backend; - const struct fragment_pipeline *frag_pipeline = NULL; DWORD ckey_caps, blit_caps, fx_caps; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -4194,8 +4207,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); memset(&fragment_caps, 0, sizeof(fragment_caps)); - frag_pipeline = select_fragment_implementation(adapter, DeviceType); - frag_pipeline->get_caps(DeviceType, &adapter->gl_info, &fragment_caps); + adapter->fragment_pipe->get_caps(DeviceType, &adapter->gl_info, &fragment_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ pCaps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; @@ -4720,7 +4732,7 @@ BOOL InitAdapters(IWineD3DImpl *This) goto nogl_adapter; } - ret = IWineD3DImpl_FillGLCaps(&adapter->driver_info, &adapter->gl_info); + ret = IWineD3DImpl_FillGLCaps(adapter); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b92b884..318d75d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2851,22 +2851,6 @@ const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, W return &none_shader_backend; } -const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); - if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) - && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; - else if (ps_selected_mode == SHADER_ATI) return &atifs_fragment_pipeline; - else if (gl_info->supported[NV_REGISTER_COMBINERS] - && gl_info->supported[NV_TEXTURE_SHADER2]) return &nvts_fragment_pipeline; - else if (gl_info->supported[NV_REGISTER_COMBINERS]) return &nvrc_fragment_pipeline; - else return &ffp_fragment_pipeline; -} - const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c5713c0..038fa3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1362,6 +1362,8 @@ struct wined3d_adapter unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ unsigned int UsedTextureRam; LUID luid; + + const struct fragment_pipeline *fragment_pipe; }; BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; @@ -2568,8 +2570,6 @@ unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; -const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Update the swapchain' s present parameters when changing the backbuffer.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 93c49f1777764658192eed75e983cf7986669274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c49f1777764658192eed75e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:55 2010 +0100 wined3d: Update the swapchain's present parameters when changing the backbuffer. This fixes a bug exposed by commit b5907e23cc595de1f0aba2a615c8c4510b433d36. --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 955b221..02c468f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5621,6 +5621,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa if(Swapchain->backBuffer[0]) { IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], (IWineD3DBase *) Swapchain); ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags |= SFLAG_SWAPCHAIN; + Swapchain->presentParms.BackBufferWidth = BackImpl->currentDesc.Width; + Swapchain->presentParms.BackBufferHeight = BackImpl->currentDesc.Height; + Swapchain->presentParms.BackBufferFormat = BackImpl->resource.format_desc->format; } else { HeapFree(GetProcessHeap(), 0, Swapchain->backBuffer); Swapchain->backBuffer = NULL;

1 0

Henri Verbeet : wined3d: TRACE IWineD3DDeviceImpl_CreateSurface() parameters.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 97700f05a91e8891f5381eb08e1d04bf832207b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97700f05a91e8891f5381eb08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:54 2010 +0100 wined3d: TRACE IWineD3DDeviceImpl_CreateSurface() parameters. --- dlls/wined3d/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0cc27c9..955b221 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -596,7 +596,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UI IWineD3DSurfaceImpl *object; HRESULT hr; - TRACE("(%p) Create surface\n",This); + TRACE("iface %p, width %u, height %u, format %s (%#x), lockable %#x, discard %#x, level %u\n", + iface, Width, Height, debug_d3dformat(Format), Format, Lockable, Discard, Level); + TRACE("surface %p, usage %s (%#x), pool %s (%#x), multisample_type %#x, multisample_quality %u\n", + ppSurface, debug_d3dusage(Usage), Usage, debug_d3dpool(Pool), Pool, MultiSample, MultisampleQuality); + TRACE("surface_type %#x, parent %p, parent_ops %p.\n", Impl, parent, parent_ops); if (Impl == SURFACE_OPENGL && !This->adapter) {

1 0

Henri Verbeet : wined3d: Dump ARB program shaders on compile failure.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 42c83f0260ab7972b4524dfe536323b033f1c633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c83f0260ab7972b4524dfe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:53 2010 +0100 wined3d: Dump ARB program shaders on compile failure. Similar to the patch for GLSL. --- dlls/wined3d/arb_program_shader.c | 57 +++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a76cd66..e4653f0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -41,6 +41,45 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) +/* Extract a line. Note that this modifies the source string. */ +static char *get_line(char **ptr) +{ + char *p, *q; + + p = *ptr; + if (!(q = strstr(p, "\n"))) + { + if (!*p) return NULL; + *ptr += strlen(p); + return p; + } + *q = '\0'; + *ptr = q + 1; + + return p; +} + +static void shader_arb_dump_program_source(const char *source) +{ + unsigned long source_size; + char *ptr, *line, *tmp; + + source_size = strlen(source) + 1; + tmp = HeapAlloc(GetProcessHeap(), 0, source_size); + if (!tmp) + { + ERR("Failed to allocate %lu bytes for shader source.\n", source_size); + return; + } + memcpy(tmp, source, source_size); + + ptr = tmp; + while ((line = get_line(&ptr))) FIXME(" %s\n", line); + FIXME("\n"); + + HeapFree(GetProcessHeap(), 0, tmp); +} + /* GL locking for state handlers is done by the caller. */ static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_info *gl_info) { @@ -3047,8 +3086,9 @@ static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_inf glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Vertex program error at position %d: %s\n", pos, + FIXME("Vertex program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(blt_vprogram); } else { @@ -3109,8 +3149,9 @@ static GLuint create_arb_blt_fragment_program(const struct wined3d_gl_info *gl_i glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Fragment program error at position %d: %s\n", pos, + FIXME("Fragment program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(blt_fprograms[tex_type]); } else { @@ -3565,8 +3606,9 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); if (errPos != -1) { - FIXME("HW PixelShader Error at position %d: %s\n", + FIXME("HW PixelShader Error at position %d: %s\n\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer->buffer); retval = 0; } else @@ -3975,8 +4017,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); if (errPos != -1) { - FIXME("HW VertexShader Error at position %d: %s\n", + FIXME("HW VertexShader Error at position %d: %s\n\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer->buffer); ret = -1; } else @@ -5864,8 +5907,9 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Fragment program error at position %d: %s\n", pos, + FIXME("Fragment program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer.buffer); } else { @@ -6568,8 +6612,9 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); if (pos != -1) { - FIXME("Fragment program error at position %d: %s\n", pos, + FIXME("Fragment program error at position %d: %s\n\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer.buffer); } else {

1 0

Stefan Dösinger : d3d8: Test buffer lock flags.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: e2f83db007806095ca89057afe66488d8c745c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f83db007806095ca89057af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 30 12:21:31 2010 +0100 d3d8: Test buffer lock flags. --- dlls/d3d8/tests/Makefile.in | 1 + dlls/d3d8/tests/buffer.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 9728d97..3e30e39 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = user32 kernel32 CTESTS = \ d3d8_main.c \ + buffer.c \ device.c \ stateblock.c \ surface.c \ diff --git a/dlls/d3d8/tests/buffer.c b/dlls/d3d8/tests/buffer.c new file mode 100644 index 0000000..725e642 --- /dev/null +++ b/dlls/d3d8/tests/buffer.c @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2010 Stefan Dösinger(for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <d3d8.h> +#include "wine/test.h" + +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "d3d8_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d8_test_wc", "d3d8_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + +static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) +{ + IDirect3D8 * (__stdcall * d3d8_create)(UINT SDKVersion) = 0; + IDirect3D8 *d3d8_ptr = 0; + IDirect3DDevice8 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + D3DDISPLAYMODE d3ddm; + HRESULT hr; + + d3d8_create = (void *)GetProcAddress(d3d8_handle, "Direct3DCreate8"); + ok(d3d8_create != NULL, "Failed to get address of Direct3DCreate8\n"); + if (!d3d8_create) return NULL; + + d3d8_ptr = d3d8_create(D3D_SDK_VERSION); + if (!d3d8_ptr) + { + skip("could not create D3D8\n"); + return NULL; + } + + IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = create_window(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + return NULL; + } + + return device_ptr; +} + +static void lock_flag_test(IDirect3DDevice8 *device) +{ + HRESULT hr; + IDirect3DVertexBuffer8 *buffer; + unsigned int i; + BYTE *data; + const struct + { + DWORD flags; + const char *debug_string; + HRESULT result; + } + test_data[] = + { + {D3DLOCK_READONLY, "D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_DISCARD, "D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK }, + /* Completely bogous flags aren't an error */ + {0xdeadbeef, "0xdeadbeef", D3D_OK }, + }; + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer); + ok(hr == D3D_OK, "IDirect3DDevice8_CreateBuffer failed, 0x%08x\n", hr); + + for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, test_data[i].flags); + ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n", + test_data[i].debug_string, hr, test_data[i].result); + + if(SUCCEEDED(hr)) + { + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8_Unlock failed, 0x%08x\n", hr); + } + } + + IDirect3DVertexBuffer8_Release(buffer); +} + +START_TEST(buffer) +{ + IDirect3DDevice8 *device_ptr; + ULONG refcount; + HMODULE d3d8_handle = 0; + + d3d8_handle = LoadLibraryA("d3d8.dll"); + if (!d3d8_handle) + { + skip("Could not load d3d8.dll\n"); + return; + } + + device_ptr = init_d3d8(d3d8_handle); + if (!device_ptr) return; + + lock_flag_test(device_ptr); + + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); +}

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
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 February 2010