August 2019 - Wine-devel - list.winehq.org

[PATCH] mscoree: Update Wine Mono to 4.9.2.
by Vincent Povirk 05 Aug '19

05 Aug '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a05ca46dac4..8be579d6dc8 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.0" -#define MONO_SHA "8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713" +#define MONO_VERSION "4.9.2" +#define MONO_SHA "b91f4656fca72d036934c2a9e845b2dfadad291e48e0b013fb2b08698200ff74" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7420b4bea3f..bcad7f4f252 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.0" +#define WINE_MONO_VERSION "4.9.2" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

[PATCH 1/5] strmbase: Remove unused wine/unicode.h import.
by Zebediah Figura 05 Aug '19

05 Aug '19

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/strmbase/strmbase_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 439ab9aefaf..06fbe62a425 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -31,7 +31,6 @@ #include "wine/heap.h" #include "wine/list.h" #include "wine/strmbase.h" -#include "wine/unicode.h" /* Quality Control */ typedef struct QualityControlImpl { -- 2.20.1

2 6

[PATCH 3/3] wined3d: Add GPU information for a few more Intel KBL GPUs.
by Henri Verbeet 05 Aug '19

05 Aug '19

From: Kristján Gerhardsson <kristjang(a)ccpgames.com> Signed-off-by: Kristján Gerhardsson <kristjang(a)ccpgames.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 167906. dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b4d8c5b3c6..15063e77049 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -478,8 +478,10 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, - {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5c972ce37e..38a607f4e3a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2594,8 +2594,10 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_UHD617 = 0x87c0, CARD_INTEL_HD620 = 0x5916, - CARD_INTEL_HD630 = 0x5912, + CARD_INTEL_HD630_1 = 0x5912, + CARD_INTEL_HD630_2 = 0x591b, }; struct wined3d_fbo_ops -- 2.11.0

1 0

[PATCH 2/3] wined3d: Add GPU information for AMD VEGA20.
by Henri Verbeet 05 Aug '19

05 Aug '19

From: Kristján Gerhardsson <kristjang(a)ccpgames.com> Signed-off-by: Kristján Gerhardsson <kristjang(a)ccpgames.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 167906. dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6043cc1e6f4..7b4d8c5b3c6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -396,7 +396,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_M395X, "AMD Radeon R9 M395X", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7fd136adae..e5c972ce37e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2378,7 +2378,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_R9_M395X = 0x6920, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, - CARD_AMD_RADEON_RX_VEGA = 0x687f, + CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, + CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, -- 2.11.0

1 0

[PATCH 1/3] wined3d: Inhibit the screensaver while a full-screen application has focus.
by Henri Verbeet 05 Aug '19

05 Aug '19

From: Zebediah Figura <zfigura(a)codeweavers.com> This matches Windows behaviour at least as of Windows 7. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 167864. dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/swapchain.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a6b005bf1d..6b4b07975a9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -912,6 +912,8 @@ static void destroy_default_samplers(struct wined3d_device *device, struct wined HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) { + unsigned int screensaver_active; + TRACE("device %p, window %p.\n", device, window); if (!wined3d_register_window(NULL, window, device, 0)) @@ -922,6 +924,9 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); return WINED3D_OK; } @@ -932,6 +937,11 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) if (device->focus_window) wined3d_unregister_window(device->focus_window); InterlockedExchangePointer((void **)&device->focus_window, NULL); + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } } static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d73dd1eee5..4aa56bb3f57 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1172,6 +1172,7 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; + unsigned int screensaver_active; BOOL focus_messages, filter; /* This code is not protected by the wined3d mutex, so it may run while @@ -1184,6 +1185,10 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (activate) { + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) { /* The d3d versions do not agree on the exact messages here. D3d8 restores @@ -1209,6 +1214,12 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa } else { + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, NULL))) ERR("Failed to set display mode.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7d9cd74258..f7fd136adae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3180,7 +3180,8 @@ struct wined3d_device BYTE d3d_initialized : 1; BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ - BYTE padding : 4; + BYTE restore_screensaver : 1; + BYTE padding : 3; unsigned char surface_alignment; /* Line Alignment of surfaces */ -- 2.11.0

1 0

[PATCH] wined3d: Fix memory leak in wined3d_swapchain_state_create() (Coverity).
by Józef Kucia 05 Aug '19

05 Aug '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d73dd1eee5d..04ee0454b61e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1624,7 +1624,10 @@ HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc return E_OUTOFMEMORY; if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d, adapter_idx))) + { + heap_free(s); return hr; + } *state = s; -- 2.21.0

2 1

[PATCH 5/5] wined3d: Use d3d_info to determine whether shader outputs need interpolation qualifiers.
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/shader.c | 15 ++++++--------- dlls/wined3d/wined3d_private.h | 17 +++++------------ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a0167f0b00b..5f6d673bfdf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3770,6 +3770,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); + d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1acb6c74bf6..41cf157e84c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1979,6 +1979,14 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i } } +static BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info) +{ + /* In GLSL 4.40+ it is fine to specify interpolation qualifiers only in + * fragment shaders. In older GLSL versions interpolation qualifiers must + * match between shader stages. */ + return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); +} + static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup, const DWORD *interpolation_mode) @@ -11108,6 +11116,8 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s * shader_glsl_alloc(). */ caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING | WINED3D_SHADER_CAP_SRGB_WRITE; + if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) + caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 973941b8d9e..1d8540e5e94 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3505,10 +3505,10 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh } static void init_interpolation_compile_args(DWORD *interpolation_args, - const struct wined3d_shader *pixel_shader, const struct wined3d_gl_info *gl_info) + const struct wined3d_shader *pixel_shader, const struct wined3d_d3d_info *d3d_info) { - if (!needs_interpolation_qualifiers_for_shader_outputs(gl_info) - || !pixel_shader || pixel_shader->reg_maps.shader_version.major < 4) + if (!d3d_info->shader_output_interpolation || !pixel_shader + || pixel_shader->reg_maps.shader_version.major < 4) { memset(interpolation_args, 0, sizeof(pixel_shader->u.ps.interpolation_mode)); return; @@ -3525,7 +3525,6 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_shader *hull_shader = state->shader[WINED3D_SHADER_TYPE_HULL]; const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; args->fog_src = state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z; @@ -3548,7 +3547,7 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 args->flatshading = 0; init_interpolation_compile_args(args->interpolation_mode, - args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, gl_info); + args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, d3d_info); } static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) @@ -3865,7 +3864,6 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 const struct wined3d_shader *geometry_shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_shader *hull_shader = state->shader[WINED3D_SHADER_TYPE_HULL]; - const struct wined3d_gl_info *gl_info = context->gl_info; args->tessellator_output_primitive = hull_shader->u.hs.tessellator_output_primitive; args->tessellator_partitioning = hull_shader->u.hs.tessellator_partitioning; @@ -3877,7 +3875,7 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = context->render_offscreen; init_interpolation_compile_args(args->interpolation_mode, - args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, gl_info); + args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, context->d3d_info); args->padding = 0; } @@ -3886,14 +3884,13 @@ void find_gs_compile_args(const struct wined3d_state *state, const struct wined3 struct gs_compile_args *args, const struct wined3d_context *context) { const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - const struct wined3d_gl_info *gl_info = context->gl_info; args->output_count = pixel_shader ? pixel_shader->limits->packed_input : shader->limits->packed_output; if (!(args->primitive_type = shader->u.gs.input_type)) args->primitive_type = d3d_primitive_type_from_gl(state->gl_primitive_type); - init_interpolation_compile_args(args->interpolation_mode, pixel_shader, gl_info); + init_interpolation_compile_args(args->interpolation_mode, pixel_shader, context->d3d_info); } void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 782d91da772..52a59e0419c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,6 +205,7 @@ struct wined3d_d3d_info unsigned int vs_clipping : 1; unsigned int shader_color_key : 1; unsigned int shader_double_precision : 1; + unsigned int shader_output_interpolation : 1; unsigned int viewport_array_index_any_shader : 1; unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; @@ -1298,9 +1299,10 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 -#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002 -#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004 +#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001u +#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u +#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u +#define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u struct shader_caps { @@ -4838,15 +4840,6 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_in return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup); } -static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info) -{ - /* In GLSL 4.40+ it is fine to specify interpolation qualifiers only in - * fragment shaders. In older GLSL versions interpolation qualifiers must - * match between shader stages. - */ - return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); -} - static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geometry_shader) { return geometry_shader -- 2.11.0

1 0

[PATCH 4/5] wined3d: Get rid of the float16 fallback in context_update_stream_info().
by Henri Verbeet 05 Aug '19

05 Aug '19

This is never used, since we reject creation of vertex declarations that contain any elements with unsupported formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 11 +---------- dlls/wined3d/vertexdeclaration.c | 5 ----- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9ce883d9631..ea7eaf9911c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3601,7 +3601,6 @@ static void context_update_stream_info(struct wined3d_context *context, const st { struct wined3d_stream_info *stream_info = &context->stream_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; DWORD prev_all_vbo = stream_info->all_vbo; unsigned int i; WORD map; @@ -3664,15 +3663,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (stream_info->all_vbo) return; - if (use_vs(state)) - { - if (state->vertex_declaration->have_half_floats && !gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - TRACE("Using immediate mode draw with vertex shaders for FLOAT16 conversion.\n"); - context->use_immediate_mode_draw = TRUE; - } - } - else + if (!use_vs(state)) { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cd8bb5e4233..81032745a06 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -251,11 +251,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara heap_free(declaration->elements); return E_FAIL; } - - if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) - { - declaration->have_half_floats = TRUE; - } } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9a234872fb..782d91da772 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3740,7 +3740,6 @@ struct wined3d_vertex_declaration unsigned int element_count; BOOL position_transformed; - BOOL have_half_floats; }; struct wined3d_saved_states -- 2.11.0

1 0

[PATCH 3/5] wined3d: Use d3d_info to determine BGRA vertex support in context_update_stream_info().
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 998aaef81b2..9ce883d9631 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3675,7 +3675,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); - slow_mask |= -(!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !d3d_info->ffp_generic_attributes) + slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if ((stream_info->position_transformed && !d3d_info->xyzrhw) -- 2.11.0

1 0

[PATCH 2/5] wined3d: Return a wined3d_context_gl structure from context_get_current().
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 29 ++++++--- dlls/wined3d/arb_program_shader.c | 8 +-- dlls/wined3d/context.c | 57 +++++++++-------- dlls/wined3d/gl_compat.c | 126 +++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 123 insertions(+), 99 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 84e5360c332..a0167f0b00b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3983,10 +3983,11 @@ static void WINE_GLAPI invalid_generic_attrib_func(GLuint idx, const void *data) * draw_primitive_immediate_mode(). */ static void WINE_GLAPI position_d3dcolor(const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; DWORD pos = *((const DWORD *)data); FIXME("Add a test for fixed function position from d3dcolor type.\n"); - context_get_current()->gl_info->gl_ops.gl.p_glVertex4s(D3DCOLOR_B_R(pos), + gl_info->gl_ops.gl.p_glVertex4s(D3DCOLOR_B_R(pos), D3DCOLOR_B_G(pos), D3DCOLOR_B_B(pos), D3DCOLOR_B_A(pos)); @@ -3994,25 +3995,27 @@ static void WINE_GLAPI position_d3dcolor(const void *data) static void WINE_GLAPI position_float4(const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; const GLfloat *pos = data; if (pos[3] != 0.0f && pos[3] != 1.0f) { float w = 1.0f / pos[3]; - context_get_current()->gl_info->gl_ops.gl.p_glVertex4f(pos[0] * w, pos[1] * w, pos[2] * w, w); + gl_info->gl_ops.gl.p_glVertex4f(pos[0] * w, pos[1] * w, pos[2] * w, w); } else { - context_get_current()->gl_info->gl_ops.gl.p_glVertex3fv(pos); + gl_info->gl_ops.gl.p_glVertex3fv(pos); } } static void WINE_GLAPI diffuse_d3dcolor(const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; DWORD diffuseColor = *((const DWORD *)data); - context_get_current()->gl_info->gl_ops.gl.p_glColor4ub(D3DCOLOR_B_R(diffuseColor), + gl_info->gl_ops.gl.p_glColor4ub(D3DCOLOR_B_R(diffuseColor), D3DCOLOR_B_G(diffuseColor), D3DCOLOR_B_B(diffuseColor), D3DCOLOR_B_A(diffuseColor)); @@ -4020,6 +4023,7 @@ static void WINE_GLAPI diffuse_d3dcolor(const void *data) static void WINE_GLAPI specular_d3dcolor(const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; DWORD specularColor = *((const DWORD *)data); GLubyte d[] = { @@ -4028,7 +4032,7 @@ static void WINE_GLAPI specular_d3dcolor(const void *data) D3DCOLOR_B_B(specularColor) }; - context_get_current()->gl_info->gl_ops.ext.p_glSecondaryColor3ubvEXT(d); + gl_info->gl_ops.ext.p_glSecondaryColor3ubvEXT(d); } static void WINE_GLAPI warn_no_specular_func(const void *data) @@ -4038,43 +4042,48 @@ static void WINE_GLAPI warn_no_specular_func(const void *data) static void WINE_GLAPI generic_d3dcolor(GLuint idx, const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; DWORD color = *((const DWORD *)data); - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4Nub(idx, + gl_info->gl_ops.ext.p_glVertexAttrib4Nub(idx, D3DCOLOR_B_R(color), D3DCOLOR_B_G(color), D3DCOLOR_B_B(color), D3DCOLOR_B_A(color)); } static void WINE_GLAPI generic_short2n(GLuint idx, const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; const GLshort s[] = {((const GLshort *)data)[0], ((const GLshort *)data)[1], 0, 1}; - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4Nsv(idx, s); + gl_info->gl_ops.ext.p_glVertexAttrib4Nsv(idx, s); } static void WINE_GLAPI generic_ushort2n(GLuint idx, const void *data) { const GLushort s[] = {((const GLushort *)data)[0], ((const GLushort *)data)[1], 0, 1}; + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4Nusv(idx, s); + gl_info->gl_ops.ext.p_glVertexAttrib4Nusv(idx, s); } static void WINE_GLAPI generic_float16_2(GLuint idx, const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; float x = float_16_to_32(((const unsigned short *)data) + 0); float y = float_16_to_32(((const unsigned short *)data) + 1); - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib2f(idx, x, y); + gl_info->gl_ops.ext.p_glVertexAttrib2f(idx, x, y); } static void WINE_GLAPI generic_float16_4(GLuint idx, const void *data) { + const struct wined3d_gl_info *gl_info = wined3d_context_gl_get_current()->c.gl_info; float x = float_16_to_32(((const unsigned short *)data) + 0); float y = float_16_to_32(((const unsigned short *)data) + 1); float z = float_16_to_32(((const unsigned short *)data) + 2); float w = float_16_to_32(((const unsigned short *)data) + 3); - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4f(idx, x, y, z, w); + gl_info->gl_ops.ext.p_glVertexAttrib4f(idx, x, y, z, w); } static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter *adapter) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 958c9f2b362..e1ddb8e9435 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -720,12 +720,12 @@ static void shader_arb_load_constants(void *shader_priv, struct wined3d_context static void shader_arb_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) { - struct wined3d_context *context = context_get_current(); + struct wined3d_context_gl *context_gl = wined3d_context_gl_get_current(); struct shader_arb_priv *priv = device->shader_priv; /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ - if (!context || context->device != device) + if (!context_gl || context_gl->c.device != device) return; memset(priv->vshader_const_dirty + start, 1, sizeof(*priv->vshader_const_dirty) * count); @@ -734,12 +734,12 @@ static void shader_arb_update_float_vertex_constants(struct wined3d_device *devi static void shader_arb_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) { - struct wined3d_context *context = context_get_current(); + struct wined3d_context_gl *context_gl = wined3d_context_gl_get_current(); struct shader_arb_priv *priv = device->shader_priv; /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ - if (!context || context->device != device) + if (!context_gl || context_gl->c.device != device) return; memset(priv->pshader_const_dirty + start, 1, sizeof(*priv->pshader_const_dirty) * count); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 80124c17dbe..998aaef81b2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1503,17 +1503,16 @@ void context_set_tls_idx(DWORD idx) wined3d_context_tls_idx = idx; } -struct wined3d_context *context_get_current(void) +struct wined3d_context_gl *wined3d_context_gl_get_current(void) { return TlsGetValue(wined3d_context_tls_idx); } BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) { - struct wined3d_context *ctx = context_gl ? &context_gl->c : NULL; - struct wined3d_context *old = context_get_current(); + struct wined3d_context_gl *old = wined3d_context_gl_get_current(); - if (old == ctx) + if (old == context_gl) { TRACE("Already using D3D context %p.\n", context_gl); return TRUE; @@ -1521,22 +1520,22 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) if (old) { - if (old->destroyed) + if (old->c.destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - wined3d_context_gl_cleanup(wined3d_context_gl(old)); - heap_free((void *)old->gl_info); + wined3d_context_gl_cleanup(old); + heap_free((void *)old->c.gl_info); heap_free(old); } else { if (wglGetCurrentContext()) { - const struct wined3d_gl_info *gl_info = old->gl_info; + const struct wined3d_gl_info *gl_info = old->c.gl_info; TRACE("Flushing context %p before switching to %p.\n", old, context_gl); gl_info->gl_ops.gl.p_glFlush(); } - old->current = 0; + old->c.current = 0; } } @@ -1566,7 +1565,7 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) } } - return TlsSetValue(wined3d_context_tls_idx, ctx); + return TlsSetValue(wined3d_context_tls_idx, context_gl); } void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) @@ -1579,7 +1578,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) { if (!context->level) WARN("Context %p is not active.\n", context); - else if (context != context_get_current()) + else if (context_gl != wined3d_context_gl_get_current()) WARN("Context %p is not the current context.\n", context); } @@ -1623,10 +1622,10 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) if (!context_gl->c.level++) { - const struct wined3d_context *current_context = context_get_current(); + const struct wined3d_context_gl *current_context = wined3d_context_gl_get_current(); HGLRC current_gl = wglGetCurrentContext(); - if (current_gl && (!current_context || wined3d_context_gl_const(current_context)->gl_ctx != current_gl)) + if (current_gl && (!current_context || current_context->gl_ctx != current_gl)) { TRACE("Another GL context (%p on device context %p) is already current.\n", current_gl, wglGetCurrentDC()); @@ -4198,7 +4197,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, if (!context_gl->valid) return; - if (&context_gl->c != context_get_current()) + if (context_gl != wined3d_context_gl_get_current()) { if (!wined3d_context_gl_set_current(context_gl)) ERR("Failed to activate the new context.\n"); @@ -4212,22 +4211,22 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context *current_context = context_get_current(); - struct wined3d_context *context; + struct wined3d_context_gl *current_context = wined3d_context_gl_get_current(); + struct wined3d_context_gl *context_gl; TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - if (current_context && current_context->destroyed) + if (current_context && current_context->c.destroyed) current_context = NULL; if (!texture) { if (current_context - && current_context->current_rt.texture - && current_context->device == device) + && current_context->c.current_rt.texture + && current_context->c.device == device) { - texture = current_context->current_rt.texture; - sub_resource_idx = current_context->current_rt.sub_resource_idx; + texture = current_context->c.current_rt.texture; + sub_resource_idx = current_context->c.current_rt.sub_resource_idx; } else { @@ -4241,15 +4240,15 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * } } - if (current_context && current_context->current_rt.texture == texture) + if (current_context && current_context->c.current_rt.texture == texture) { - context = current_context; + context_gl = current_context; } else if (texture && !wined3d_resource_is_offscreen(&texture->resource)) { TRACE("Rendering onscreen.\n"); - if (!(context = swapchain_get_context(texture->swapchain))) + if (!(context_gl = wined3d_context_gl(swapchain_get_context(texture->swapchain)))) return NULL; } else @@ -4258,15 +4257,15 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * /* Stay with the current context if possible. Otherwise use the * context for the primary swapchain. */ - if (current_context && current_context->device == device) - context = current_context; - else if (!(context = swapchain_get_context(device->swapchains[0]))) + if (current_context && current_context->c.device == device) + context_gl = current_context; + else if (!(context_gl = wined3d_context_gl(swapchain_get_context(device->swapchains[0])))) return NULL; } - wined3d_context_gl_activate(wined3d_context_gl(context), texture, sub_resource_idx); + wined3d_context_gl_activate(context_gl, texture, sub_resource_idx); - return context; + return &context_gl->c; } struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index c1491d4c631..a492bd1513f 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -32,84 +32,104 @@ WINE_DEFAULT_DEBUG_CHANNEL(gl_compat); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); /* Start GL_ARB_multitexture emulation */ -static void WINE_GLAPI wine_glMultiTexCoord1fARB(GLenum target, GLfloat s) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord1fARB(GLenum target, GLfloat s) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord1f(s); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord1f(s); } -static void WINE_GLAPI wine_glMultiTexCoord1fvARB(GLenum target, const GLfloat *v) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord1fvARB(GLenum target, const GLfloat *v) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord1fv(v); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord1fv(v); } -static void WINE_GLAPI wine_glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord2f(s, t); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord2f(s, t); } -static void WINE_GLAPI wine_glMultiTexCoord2fvARB(GLenum target, const GLfloat *v) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord2fvARB(GLenum target, const GLfloat *v) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord2fv(v); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord2fv(v); } -static void WINE_GLAPI wine_glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord3f(s, t, r); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord3f(s, t, r); } -static void WINE_GLAPI wine_glMultiTexCoord3fvARB(GLenum target, const GLfloat *v) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord3fvARB(GLenum target, const GLfloat *v) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord3fv(v); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord3fv(v); } -static void WINE_GLAPI wine_glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord4f(s, t, r, q); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord4f(s, t, r, q); } -static void WINE_GLAPI wine_glMultiTexCoord4fvARB(GLenum target, const GLfloat *v) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord4fvARB(GLenum target, const GLfloat *v) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord4fv(v); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord4fv(v); } -static void WINE_GLAPI wine_glMultiTexCoord2svARB(GLenum target, const GLshort *v) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord2svARB(GLenum target, const GLshort *v) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord2sv(v); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord2sv(v); } -static void WINE_GLAPI wine_glMultiTexCoord4svARB(GLenum target, const GLshort *v) { - if(target != GL_TEXTURE0) { - ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); +static void WINE_GLAPI wine_glMultiTexCoord4svARB(GLenum target, const GLshort *v) +{ + if (target != GL_TEXTURE0) + { + ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported.\n"); return; } - context_get_current()->gl_info->gl_ops.gl.p_glTexCoord4sv(v); + wined3d_context_gl_get_current()->c.gl_info->gl_ops.gl.p_glTexCoord4sv(v); } static void WINE_GLAPI wine_glActiveTexture(GLenum texture) @@ -154,7 +174,7 @@ static void WINE_GLAPI wine_glEnable(GLenum cap) { if (cap == GL_FOG) { - struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + struct wined3d_context_gl *ctx = wined3d_context_gl_get_current(); ctx->fog_enabled = 1; if (ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) @@ -168,7 +188,7 @@ static void WINE_GLAPI wine_glDisable(GLenum cap) { if (cap == GL_FOG) { - struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + struct wined3d_context_gl *ctx = wined3d_context_gl_get_current(); ctx->fog_enabled = 0; if (ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) @@ -180,7 +200,7 @@ static void WINE_GLAPI wine_glDisable(GLenum cap) static void (WINE_GLAPI *old_fogcoord_glFogi)(GLenum pname, GLint param); static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { - struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + struct wined3d_context_gl *ctx = wined3d_context_gl_get_current(); if (pname == GL_FOG_COORDINATE_SOURCE_EXT) { @@ -209,7 +229,7 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) static void (WINE_GLAPI *old_fogcoord_glFogiv)(GLenum pname, const GLint *param); static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { - struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + struct wined3d_context_gl *ctx = wined3d_context_gl_get_current(); if (pname == GL_FOG_COORDINATE_SOURCE_EXT) { @@ -238,7 +258,7 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) static void (WINE_GLAPI *old_fogcoord_glFogf)(GLenum pname, GLfloat param); static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { - struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + struct wined3d_context_gl *ctx = wined3d_context_gl_get_current(); if (pname == GL_FOG_COORDINATE_SOURCE_EXT) { @@ -267,7 +287,7 @@ static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) static void (WINE_GLAPI *old_fogcoord_glFogfv)(GLenum pname, const GLfloat *param); static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) { - struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + struct wined3d_context_gl *ctx = wined3d_context_gl_get_current(); if (pname == GL_FOG_COORDINATE_SOURCE_EXT) { @@ -309,18 +329,16 @@ static void (WINE_GLAPI *old_fogcoord_glColor4f)(GLfloat r, GLfloat g, GLfloat b static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { - struct wined3d_context *ctx = context_get_current(); - struct wined3d_context_gl *ctx_gl; + const struct wined3d_context_gl *ctx_gl = wined3d_context_gl_get_current(); /* This can be called from draw_test_quad() and at that point there is no * wined3d_context current. */ - if (!ctx) + if (!ctx_gl) { old_fogcoord_glVertex4f(x, y, z, w); return; } - ctx_gl = wined3d_context_gl(ctx); if (ctx_gl->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx_gl->fog_enabled) { GLfloat c[4] = {ctx_gl->colour[0], ctx_gl->colour[1], ctx_gl->colour[2], ctx_gl->colour[3]}; @@ -354,18 +372,16 @@ static void WINE_GLAPI wine_glVertex3fv(const GLfloat *pos) { static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { - struct wined3d_context *ctx = context_get_current(); - struct wined3d_context_gl *ctx_gl; + struct wined3d_context_gl *ctx_gl = wined3d_context_gl_get_current(); /* This can be called from draw_test_quad() and at that point there is no * wined3d_context current. */ - if (!ctx) + if (!ctx_gl) { old_fogcoord_glColor4f(r, g, b, a); return; } - ctx_gl = wined3d_context_gl(ctx); ctx_gl->colour[0] = r; ctx_gl->colour[1] = g; ctx_gl->colour[2] = b; @@ -393,7 +409,7 @@ static void WINE_GLAPI wine_glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte * single precision function. */ static void WINE_GLAPI wine_glFogCoordfEXT(GLfloat f) { - struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + struct wined3d_context_gl *ctx = wined3d_context_gl_get_current(); ctx->fog_coord_value = f; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60c69f13d04..c9a234872fb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2105,6 +2105,7 @@ void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *que void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_so_statistics_query(struct wined3d_so_statistics_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_timestamp_query(struct wined3d_timestamp_query *query) DECLSPEC_HIDDEN; +struct wined3d_context_gl *wined3d_context_gl_get_current(void) DECLSPEC_HIDDEN; GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; @@ -2263,7 +2264,6 @@ BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; -- 2.11.0

1 0