[PATCH 0/2] MR469: wined3d: Remove dead code directly using driver interface.
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 20 -------------------- dlls/wined3d/wined3d_private.h | 1 - dlls/wined3d/wined3d_vk.h | 5 ----- 3 files changed, 26 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3b87ab63ee5..81248d40f46 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -18,8 +18,6 @@ #include "wined3d_private.h" -#include "wine/vulkan_driver.h" - WINE_DEFAULT_DEBUG_CHANNEL(d3d); static const struct wined3d_state_entry_template misc_state_template_vk[] = @@ -214,7 +212,6 @@ static HRESULT hresult_from_vk_result(VkResult vr) } } -#ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; @@ -244,23 +241,6 @@ static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) vk_info->vulkan_lib = NULL; } } -#else -static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) -{ - struct vulkan_ops *vk_ops = &vk_info->vk_ops; - const struct vulkan_funcs *vk_funcs; - - vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); - - if (!vk_funcs) - return FALSE; - - vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; - return TRUE; -} - -static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} -#endif static void adapter_vk_destroy(struct wined3d_adapter *adapter) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 72732df7b4d..09ba3487616 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -25,7 +25,6 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H -#define USE_WIN32_VULKAN #define USE_WIN32_OPENGL #ifdef USE_WIN32_OPENGL diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 91ef8c816cd..00818f98b81 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -20,9 +20,6 @@ #define __WINE_WINED3D_VK_H #define VK_NO_PROTOTYPES -#ifndef USE_WIN32_VULKAN -#define WINE_VK_HOST -#endif #include "wine/vulkan.h" #define VK_INSTANCE_FUNCS() \ @@ -225,9 +222,7 @@ struct wined3d_vk_info unsigned int api_version; BOOL supported[WINED3D_VK_EXT_COUNT]; -#ifdef USE_WIN32_VULKAN HMODULE vulkan_lib; -#endif }; #define VK_CALL(f) (vk_info->vk_ops.f) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/469
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wined3d/Makefile.in | 2 +- dlls/wined3d/adapter_gl.c | 18 ------------------ dlls/wined3d/wined3d_private.h | 6 ------ 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index c7c87865405..23051f2a58b 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wined3d.dll IMPORTLIB = wined3d -IMPORTS = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32 win32u +IMPORTS = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32 EXTRAINCL = $(VKD3D_PE_CFLAGS) C_SRCS = \ diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d341668b808..60a168b5cef 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2756,12 +2756,6 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttribPointer) /* OpenGL 2.0 */ #undef USE_GL_FUNC -#ifndef USE_WIN32_OPENGL - /* hack: use the functions directly from the TEB table to bypass the thunks */ - /* note that we still need the above wglGetProcAddress calls to initialize the table */ - gl_info->gl_ops.ext = ((struct opengl_funcs *)NtCurrentTeb()->glTable)->ext; -#endif - #define MAP_GL_FUNCTION(core_func, ext_func) \ do \ { \ @@ -5312,7 +5306,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, return FALSE; /* Dynamically load all GL core functions */ -#ifdef USE_WIN32_OPENGL { HMODULE mod_gl = GetModuleHandleA("opengl32.dll"); #define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f); @@ -5321,17 +5314,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); gl_info->gl_ops.wgl.p_wglGetPixelFormat = (void *)GetProcAddress(mod_gl, "wglGetPixelFormat"); } -#else - /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */ - { - HDC hdc = GetDC( 0 ); - const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); - ReleaseDC( 0, hdc ); - if (!wgl_driver || wgl_driver == (void *)-1) return FALSE; - gl_info->gl_ops.wgl = wgl_driver->wgl; - gl_info->gl_ops.gl = wgl_driver->gl; - } -#endif gl_info->p_glEnableWINE = gl_info->gl_ops.gl.p_glEnable; gl_info->p_glDisableWINE = gl_info->gl_ops.gl.p_glDisable; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09ba3487616..4e0879a3985 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -25,13 +25,7 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H -#define USE_WIN32_OPENGL - -#ifdef USE_WIN32_OPENGL #define WINE_GLAPI __stdcall -#else -#define WINE_GLAPI -#endif #include <assert.h> #include <stdarg.h> -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/469
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/469
participants (3)
-
Jacek Caban -
Jacek Caban (＠jacek)
-
Zebediah Figura (＠zfigura)