wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against dff85646517526562644c23648d11596daeb26d0.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-05-21 12:07:42 +10:00
parent e3ec587726
commit f308782dad
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch
View File

@@ -1,4 +1,4 @@
From 9379d1dcd14d684a07763f28b20384c8a65bd146 Mon Sep 17 00:00:00 2001
From 734d51c817f0a3d3775716fbe3e66ccbbd04ad65 Mon Sep 17 00:00:00 2001
From: Paul Gofman <gofmanp@gmail.com>
Date: Mon, 25 Feb 2019 15:05:12 +0300
Subject: [PATCH] wined3d: Support SWVP vertex shader constants limit in state
@@ -61,10 +61,10 @@ index 40585d5257d..6377addec24 100644
hr = IDirect3DDevice9_BeginScene(device);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index bb1b949c3e1..e2618f20d16 100644
index f2ed842a0bb..1181e311075 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3924,7 +3924,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3558,7 +3558,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
const struct wined3d_saved_states *changed = &stateblock->changed;
const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT;
struct wined3d_device_context *context = &device->cs->c;
@@ -73,9 +73,9 @@ index bb1b949c3e1..e2618f20d16 100644
struct wined3d_range range;
uint32_t map;
@@ -3935,9 +3935,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3569,9 +3569,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
if (changed->pixelShader)
wined3d_device_set_pixel_shader(device, state->ps);
wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, state->ps);
+ vs_uniform_count = wined3d_device_get_vs_uniform_count(device);
+
@@ -87,7 +87,7 @@ index bb1b949c3e1..e2618f20d16 100644
wined3d_device_set_vs_consts_f(device, range.offset, range.size, &state->vs_consts_f[range.offset]);
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index db9efa70186..50551f0a663 100644
index e6a5f3f3b88..1f719688b9d 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1910,7 +1910,7 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev
@@ -186,10 +186,10 @@ index 1f1ba262336..b939da02e61 100644
default:
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b37cc260c92..c2d66362966 100644
index 3c2d2da4ac9..8ce9eeb0dda 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3694,7 +3694,7 @@ struct wined3d_state
@@ -3696,7 +3696,7 @@ struct wined3d_state
struct wined3d_shader_resource_view *shader_resource_view[WINED3D_SHADER_TYPE_COUNT][MAX_SHADER_RESOURCE_VIEWS];
struct wined3d_unordered_access_view *unordered_access_view[WINED3D_PIPELINE_COUNT][MAX_UNORDERED_ACCESS_VIEWS];
@@ -198,7 +198,7 @@ index b37cc260c92..c2d66362966 100644
struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I];
BOOL vs_consts_b[WINED3D_MAX_CONSTS_B];
@@ -3867,6 +3867,15 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device,
@@ -3869,6 +3869,15 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device,
struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN;
@@ -214,7 +214,7 @@ index b37cc260c92..c2d66362966 100644
struct wined3d_device_no3d
{
struct wined3d_device d;
@@ -4590,7 +4599,7 @@ struct wined3d_vertex_declaration
@@ -4593,7 +4602,7 @@ struct wined3d_vertex_declaration
struct wined3d_saved_states
{
@@ -224,10 +224,10 @@ index b37cc260c92..c2d66362966 100644
WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */
uint32_t ps_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_PS_CONSTS_F)];
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index b3f803b2614..841fb9f9aee 100644
index 85416b4594a..7a2829179a4 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2189,7 +2189,7 @@ struct wined3d_stateblock_state
@@ -2191,7 +2191,7 @@ struct wined3d_stateblock_state
int base_vertex_index;
struct wined3d_shader *vs;