Module: wine Branch: master Commit: 87041ba759b9d37470f7b5d64dffd917dc3811c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/87041ba759b9d37470f7b5d64dffd91...
Author: Zebediah Figura zfigura@codeweavers.com Date: Mon Apr 1 12:53:48 2024 -0500
wined3d: Remove the "arb" and "none" shader_backend options.
Do not remove the shader_backend setting entirely; it will eventually be useful for selecting the SPIR-V backend for GL.
---
dlls/wined3d/adapter_gl.c | 58 +++--------------------------------------- dlls/wined3d/wined3d_main.c | 16 ------------ dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 3 insertions(+), 73 deletions(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1acf247d7a6..2486686640f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1987,58 +1987,6 @@ static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level fea return wined3d_gpu_from_feature_level(card_vendor, feature_level); }
-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 && gl_info->supported[ARB_VERTEX_SHADER]) - return &glsl_vertex_pipe; - return &ffp_vertex_pipe; -} - -static const struct wined3d_fragment_pipe_ops *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 && gl_info->supported[ARB_FRAGMENT_SHADER]) - return &glsl_fragment_pipe; - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return &arbfp_fragment_pipeline; - if (gl_info->supported[ATI_FRAGMENT_SHADER]) - return &atifs_fragment_pipeline; - if (gl_info->supported[NV_REGISTER_COMBINERS] && gl_info->supported[NV_TEXTURE_SHADER2]) - return &nvts_fragment_pipeline; - if (gl_info->supported[NV_REGISTER_COMBINERS]) - return &nvrc_fragment_pipeline; - return &ffp_fragment_pipeline; -} - -static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) -{ - BOOL glsl = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO - || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_GLSL; - BOOL arb = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO - || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB; - - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !glsl) - { - ERR_(winediag)("Ignoring the shader backend registry key. " - "GLSL is the only shader backend available on core profile contexts. " - "You need to explicitly set GL version to use legacy contexts.\n"); - glsl = TRUE; - } - - glsl = glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - - if (glsl && gl_info->supported[ARB_VERTEX_SHADER] && gl_info->supported[ARB_FRAGMENT_SHADER]) - return &glsl_shader_backend; - if (arb && 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 (arb && (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM])) - return &arb_program_shader_backend; - return &none_shader_backend; -} - static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *extensions, const struct wined3d_extension_map *map, UINT entry_count) { @@ -3755,9 +3703,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter_gl *adapter_gl,
checkGLcall("extension detection");
- adapter->shader_backend = select_shader_backend(gl_info); - adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); - adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + adapter->shader_backend = &glsl_shader_backend; + adapter->vertex_pipe = &glsl_vertex_pipe; + adapter->fragment_pipe = &glsl_fragment_pipe;
if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2bc54299ce1..458d560c539 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -358,22 +358,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!stricmp(buffer, "arb")) - { - ERR_(winediag)("Using the ARB shader backend.\n"); - wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; - } - else if (!stricmp(buffer, "none")) - { - ERR_(winediag)("Disabling shader backends.\n"); - wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; - } - } - if (wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB - || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_NONE) - { - ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); - TRACE("Use of GL Shading Language disabled.\n"); } if (!get_config_key_dword(hkey, appkey, env, "VideoPciDeviceID", &tmpvalue)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0663e67d7e..f42d5d7d050 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -466,8 +466,6 @@ enum wined3d_shader_backend { WINED3D_SHADER_BACKEND_AUTO, WINED3D_SHADER_BACKEND_GLSL, - WINED3D_SHADER_BACKEND_ARB, - WINED3D_SHADER_BACKEND_NONE, };
#define WINED3D_CSMT_ENABLE 0x00000001
-
Alexandre Julliard