November 2016 - Wine-Commits

Józef Kucia : wined3d: Generate GLSL declarations for UAVs.
by Alexandre Julliard Nov. 24, 2016

Nov. 24, 2016

Module: wine Branch: master Commit: 7b770efe8cca517867a8de8d33a13401b17c5022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b770efe8cca517867a8de8d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:04 2016 +0100 wined3d: Generate GLSL declarations for UAVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 54 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 13 +++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 41ace75..747883b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2040,6 +2040,56 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont sampler_type_prefix, sampler_type, prefix, entry->bind_idx); } + /* Declare images */ + for (i = 0; i < ARRAY_SIZE(reg_maps->uav_resource_info); ++i) + { + const char *image_type_prefix, *image_type; + + if (!reg_maps->uav_resource_info[i].type) + continue; + + switch (reg_maps->uav_resource_info[i].data_type) + { + case WINED3D_DATA_FLOAT: + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: + image_type_prefix = ""; + break; + + case WINED3D_DATA_INT: + image_type_prefix = "i"; + break; + + case WINED3D_DATA_UINT: + image_type_prefix = "u"; + break; + + default: + image_type_prefix = ""; + ERR("Unhandled resource data type %#x.\n", reg_maps->uav_resource_info[i].data_type); + break; + } + + switch (reg_maps->uav_resource_info[i].type) + { + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: + image_type = "image2D"; + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + image_type = "image3D"; + break; + + default: + image_type = "unsupported_image"; + FIXME("Unhandled resource type %#x.\n", reg_maps->uav_resource_info[i].type); + break; + } + + shader_addline(buffer, "writeonly uniform %s%s %s_image%u;\n", + image_type_prefix, image_type, prefix, i); + } + /* Declare uniforms for NP2 texcoord fixup: * This is NOT done inside the loop that declares the texture samplers * since the NP2 fixup code is currently only used for the GeforceFX @@ -5879,6 +5929,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, { if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); + if (gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) + shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) @@ -8732,7 +8784,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, - /* WINED3DSIH_DCL_UAV_TYPED */ NULL, + /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFAULT */ shader_glsl_default, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index abaa77c..4201db3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -889,7 +889,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } /* Handle declarations. */ - if (ins.handler_idx == WINED3DSIH_DCL) + if (ins.handler_idx == WINED3DSIH_DCL + || ins.handler_idx == WINED3DSIH_DCL_UAV_TYPED) { struct wined3d_shader_semantic *semantic = &ins.declaration.semantic; unsigned int reg_idx = semantic->reg.reg.idx[0].offset; @@ -937,6 +938,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->resource_info[reg_idx].data_type = semantic->resource_data_type; break; + case WINED3DSPR_UAV: + if (reg_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV resource index %u.\n", reg_idx); + break; + } + reg_maps->uav_resource_info[reg_idx].type = semantic->resource_type; + reg_maps->uav_resource_info[reg_idx].data_type = semantic->resource_data_type; + break; + default: TRACE("Not recording DCL register type %#x.\n", semantic->reg.reg.type); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24c10fa..02d2f58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -184,6 +184,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 +#define MAX_UNORDERED_ACCESS_VIEWS 8 #define MAX_VERTEX_BLENDS 4 #define MAX_MULTISAMPLE_TYPES 8 @@ -836,6 +837,7 @@ struct wined3d_shader_reg_maps DWORD sampler_comparison_mode; BYTE bumpmat; /* MAX_TEXTURES, 8 */ BYTE luminanceparams; /* MAX_TEXTURES, 8 */ + struct wined3d_shader_resource_info uav_resource_info[MAX_UNORDERED_ACCESS_VIEWS]; WORD usesnrm : 1; WORD vpos : 1;

1 0

Józef Kucia : wined3d: Add ARB_shader_image_load_store extension.
by Alexandre Julliard Nov. 24, 2016

Nov. 24, 2016

Module: wine Branch: master Commit: e9011a011eba70f28305358178a7d7bb4443df90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9011a011eba70f2830535817… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:03 2016 +0100 wined3d: Add ARB_shader_image_load_store extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f200f5..5b56ae4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -145,6 +145,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, + {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shadow", ARB_SHADOW }, @@ -2707,6 +2708,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetSamplerParameterfv) USE_GL_FUNC(glGetSamplerParameterIiv) USE_GL_FUNC(glGetSamplerParameterIuiv) + /* GL_ARB_shader_image_load_store */ + USE_GL_FUNC(glBindImageTexture) + USE_GL_FUNC(glMemoryBarrier) /* GL_ARB_shader_objects */ USE_GL_FUNC(glAttachObjectARB) USE_GL_FUNC(glBindAttribLocationARB) @@ -3622,6 +3626,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + {ARB_SHADER_IMAGE_LOAD_STORE, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e9c83b..41ace75 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8613,7 +8613,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * soon as we introduce them, adjusting the GL / GLSL version checks * accordingly. */ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] - && gl_info->supported[ARB_DERIVATIVE_CONTROL]) + && gl_info->supported[ARB_DERIVATIVE_CONTROL] + && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b71190d..d0b3102 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -78,6 +78,7 @@ enum wined3d_gl_extension ARB_PROVOKING_VERTEX, ARB_SAMPLER_OBJECTS, ARB_SHADER_BIT_ENCODING, + ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADOW,

1 0

Józef Kucia : wined3d: Do not record sampler usage for UAVs.
by Alexandre Julliard Nov. 24, 2016

Nov. 24, 2016

Module: wine Branch: master Commit: f1ea3fd5b3e201d8f4b632655c79c75008beb398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ea3fd5b3e201d8f4b632655… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:02 2016 +0100 wined3d: Do not record sampler usage for UAVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 61509d9..abaa77c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1257,7 +1257,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st ins.src[2].reg.idx[0].offset, reg_maps->sampler_map.count); } else if (ins.handler_idx == WINED3DSIH_LD - || ins.handler_idx == WINED3DSIH_RESINFO) + || (ins.handler_idx == WINED3DSIH_RESINFO && ins.src[1].reg.type == WINED3DSPR_RESOURCE)) { shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count);

1 0

Nikolay Sivov : shell32: Use interface pointers instead of a pointer to implementation structure.
by Alexandre Julliard Nov. 23, 2016

Nov. 23, 2016

Module: wine Branch: master Commit: 5ad123f851bf67ea82c949f27ac469b09adff9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad123f851bf67ea82c949f27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 18:15:33 2016 +0300 shell32: Use interface pointers instead of a pointer to implementation structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 57 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 5990982..3bdd205 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -201,47 +201,52 @@ typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMa * ##### helperfunctions for communication with ICommDlgBrowser ##### */ static BOOL IsInCommDlg(IShellViewImpl * This) -{ return(This->pCommDlgBrowser != NULL); +{ + return This->pCommDlgBrowser != NULL; } static HRESULT IncludeObject(IShellViewImpl * This, LPCITEMIDLIST pidl) { - HRESULT ret = S_OK; + HRESULT ret = S_OK; - if ( IsInCommDlg(This) ) - { - TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); - ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView*)This, pidl); - TRACE("--0x%08x\n", ret); - } - return ret; + if (IsInCommDlg(This)) + { + TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); + ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView *)&This->IShellView3_iface, pidl); + TRACE("-- returns 0x%08x\n", ret); + } + + return ret; } static HRESULT OnDefaultCommand(IShellViewImpl * This) { - HRESULT ret = S_FALSE; + HRESULT ret = S_FALSE; - if (IsInCommDlg(This)) - { - TRACE("ICommDlgBrowser::OnDefaultCommand\n"); - ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView*)This); - TRACE("-- returns %08x\n", ret); - } - return ret; + if (IsInCommDlg(This)) + { + TRACE("ICommDlgBrowser::OnDefaultCommand\n"); + ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView *)&This->IShellView3_iface); + TRACE("-- returns 0x%08x\n", ret); + } + + return ret; } -static HRESULT OnStateChange(IShellViewImpl * This, UINT uFlags) +static HRESULT OnStateChange(IShellViewImpl * This, UINT change) { - HRESULT ret = S_FALSE; + HRESULT ret = S_FALSE; - if (IsInCommDlg(This)) - { - TRACE("ICommDlgBrowser::OnStateChange flags=%x\n", uFlags); - ret = ICommDlgBrowser_OnStateChange(This->pCommDlgBrowser, (IShellView*)This, uFlags); - TRACE("--\n"); - } - return ret; + if (IsInCommDlg(This)) + { + TRACE("ICommDlgBrowser::OnStateChange change=%d\n", change); + ret = ICommDlgBrowser_OnStateChange(This->pCommDlgBrowser, (IShellView *)&This->IShellView3_iface, change); + TRACE("-- returns 0x%08x\n", ret); + } + + return ret; } + /********************************************************** * set the toolbar of the filedialog buttons *

1 0

Michael Stefaniuc : winepulse: Avoid casting a COM object to an interface.
by Alexandre Julliard Nov. 23, 2016

Nov. 23, 2016

Module: wine Branch: master Commit: 703080afb4c95e5008962714c5b577621d67f179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703080afb4c95e5008962714c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 23 11:57:40 2016 +0100 winepulse: Avoid casting a COM object to an interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f6d05d9..f6946ce 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -981,7 +981,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient for (i = 0; i < PA_CHANNELS_MAX; ++i) This->vol[i] = 1.f; - hr = CoCreateFreeThreadedMarshaler((IUnknown*)This, &This->marshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient_iface, &This->marshal); if (hr) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Henri Verbeet : wined3d: Don' t require the ARB program shader backend for the ARB fragment program FFP implementation.
by Alexandre Julliard Nov. 23, 2016

Nov. 23, 2016

Module: wine Branch: master Commit: 3de3e64e8b391ab4f8e1d3f5a797e2dd4e028930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de3e64e8b391ab4f8e1d3f5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:30 2016 +0100 wined3d: Don't require the ARB program shader backend for the ARB fragment program FFP implementation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2a6e4b6..c9b9146 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2489,7 +2489,7 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru { if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_fragment_pipe; - if (shader_backend_ops == &arb_program_shader_backend && gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; if (gl_info->supported[ATI_FRAGMENT_SHADER]) return &atifs_fragment_pipeline;

1 0

Henri Verbeet : wined3d: Properly check for the required extensions before selecting the GLSL FFP implementations.
by Alexandre Julliard Nov. 23, 2016

Nov. 23, 2016

Module: wine Branch: master Commit: 6690c7090c35aff776418ef2441e1b065c81f5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6690c7090c35aff776418ef24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:29 2016 +0100 wined3d: Properly check for the required extensions before selecting the GLSL FFP implementations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6588d1c..2a6e4b6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2479,7 +2479,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct shader_caps *shad static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops) { - if (shader_backend_ops == &glsl_shader_backend) + if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_VERTEX_SHADER]) return &glsl_vertex_pipe; return &ffp_vertex_pipe; } @@ -2487,7 +2487,7 @@ static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops) { - if (shader_backend_ops == &glsl_shader_backend) + if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_fragment_pipe; if (shader_backend_ops == &arb_program_shader_backend && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline;

1 0

Henri Verbeet : wined3d: Prefer shader backends that support both vertex and fragment shaders over ones that support only either.
by Alexandre Julliard Nov. 23, 2016

Nov. 23, 2016

Module: wine Branch: master Commit: 4f3d39005185b26b04b3fc6a1242acfe79c74b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3d39005185b26b04b3fc6a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:31 2016 +0100 wined3d: Prefer shader backends that support both vertex and fragment shaders over ones that support only either. Apparently there exist some configurations that support both ARB_vertex_program and ARB_vertex_shader, but only ARB_fragment_program and not ARB_fragment_shader. Note that this would change the selected backend for the Geforce 4 cards mentioned in the comment, but hopefully the mentioned GLSL bug is no longer a concern. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9b9146..3f200f5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2504,18 +2504,12 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru { BOOL glsl = wined3d_settings.glslRequested && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - if (glsl && gl_info->supported[ARB_FRAGMENT_SHADER]) + if (glsl && gl_info->supported[ARB_VERTEX_SHADER] && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_shader_backend; - if (glsl && gl_info->supported[ARB_VERTEX_SHADER]) - { - /* Geforce4 cards support GLSL but for vertex shaders only. Further - * its reported GLSL caps are wrong. This combined with the fact that - * GLSL won't offer more features or performance, use ARB shaders only - * on this card. */ - if (gl_info->supported[NV_VERTEX_PROGRAM] && !gl_info->supported[NV_VERTEX_PROGRAM2]) - return &arb_program_shader_backend; + if (gl_info->supported[ARB_VERTEX_PROGRAM] && gl_info->supported[ARB_FRAGMENT_PROGRAM]) + return &arb_program_shader_backend; + if (glsl && (gl_info->supported[ARB_VERTEX_SHADER] || gl_info->supported[ARB_FRAGMENT_SHADER])) return &glsl_shader_backend; - } if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arb_program_shader_backend; return &none_shader_backend;

1 0

Henri Verbeet : wined3d: The drawable is a valid location for offscreen textures when " AlwaysOffscreen" is disabled.
by Alexandre Julliard Nov. 23, 2016

Nov. 23, 2016

Module: wine Branch: master Commit: 1a02c676fbe7468bf9edca637a2415d5739f376b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a02c676fbe7468bf9edca637… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:28 2016 +0100 wined3d: The drawable is a valid location for offscreen textures when "AlwaysOffscreen" is disabled. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4a572ab..b1dca69 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1364,7 +1364,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_DRAWABLE: - if (!texture->swapchain) + if (!texture->swapchain && wined3d_settings.always_offscreen) ERR("Texture %p does not have a drawable.\n", texture); return TRUE;

1 0

Henri Verbeet : wined3d: Disable GL_TEXTURE_2D again in check_filter().
by Alexandre Julliard Nov. 23, 2016

Nov. 23, 2016

Module: wine Branch: master Commit: b515f28007857184ad7084f00fcbc5168e38339b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b515f28007857184ad7084f00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:27 2016 +0100 wined3d: Disable GL_TEXTURE_2D again in check_filter(). To avoid breaking subsequent tests. In particular wined3d_adapter_find_polyoffset_scale() when draw_test_quad() isn't using GLSL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1255a9a..6a19012 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3021,6 +3021,7 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex); gl_info->gl_ops.gl.p_glDeleteTextures(1, &buffer); + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); if (gl_info->gl_ops.gl.p_glGetError()) {

1 0