wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6905b76b9400209ded97983ceca9f9c15de22d98.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-11-29 10:30:08 +11:00
parent c3db92d75d
commit d007ef33ee
4 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
patches/wined3d-bindless-texture/0001-wined3d-Use-bindless-textures-for-GLSL-shaders.patch
View File

@ -1,4 +1,4 @@
From 53a8ae5e78c5548a81bfafa20aa2551a786b120a Mon Sep 17 00:00:00 2001
From 4c505cb4e69ee0d1b44a115e7d1ce5d03e546283 Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Date: Tue, 2 Oct 2018 23:28:01 -0500
Subject: [PATCH] wined3d: Use bindless textures for GLSL shaders.
@ -19,7 +19,7 @@ Signed-off-by: Andrew Wesie <awesie@gmail.com>
10 files changed, 261 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 4464bf3ecc2..90492d16238 100644
index 521e3a044bc..9c3c430194b 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -56,6 +56,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@ -30,7 +30,7 @@ index 4464bf3ecc2..90492d16238 100644
{"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED },
{"GL_ARB_buffer_storage", ARB_BUFFER_STORAGE },
{"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT },
@@ -2106,6 +2107,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
@@ -2120,6 +2121,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
/* GL_ARB_base_instance */
USE_GL_FUNC(glDrawArraysInstancedBaseInstance)
USE_GL_FUNC(glDrawElementsInstancedBaseVertexBaseInstance)
@ -43,10 +43,10 @@ index 4464bf3ecc2..90492d16238 100644
USE_GL_FUNC(glBindFragDataLocationIndexed)
USE_GL_FUNC(glGetFragDataIndex)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index b4c395ec355..b0b8cb3dd6e 100644
index db70a9853d4..82240b65019 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5638,6 +5638,12 @@ static BOOL shader_arb_has_ffp_proj_control(void *shader_priv)
@@ -5639,6 +5639,12 @@ static BOOL shader_arb_has_ffp_proj_control(void *shader_priv)
return priv->ffp_proj_control;
}
@ -59,7 +59,7 @@ index b4c395ec355..b0b8cb3dd6e 100644
static void shader_arb_precompile(void *shader_priv, struct wined3d_shader *shader) {}
static uint64_t shader_arb_shader_compile(struct wined3d_context *context, const struct wined3d_shader_desc *shader_desc,
@@ -5666,6 +5672,7 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend =
@@ -5667,6 +5673,7 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend =
shader_arb_get_caps,
shader_arb_color_fixup_supported,
shader_arb_has_ffp_proj_control,
@ -68,10 +68,10 @@ index b4c395ec355..b0b8cb3dd6e 100644
};
diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c
index 8ac5c28c892..21a29ba157b 100644
index af46cd9dfd7..14a2e52bee8 100644
--- a/dlls/wined3d/context_gl.c
+++ b/dlls/wined3d/context_gl.c
@@ -3940,6 +3940,12 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *
@@ -3986,6 +3986,12 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *
if (!(shader = state->shader[shader_type]))
return;
@ -85,7 +85,7 @@ index 8ac5c28c892..21a29ba157b 100644
&shader->reg_maps.shader_version, &base, &count);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d14b40d8e3e..995410e984d 100644
index 909b3f7961c..138e35883d7 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -578,6 +578,59 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device)
@ -148,7 +148,7 @@ index d14b40d8e3e..995410e984d 100644
static bool wined3d_null_image_vk_init(struct wined3d_image_vk *image, struct wined3d_context_vk *context_vk,
VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int layer_count, unsigned int sample_count)
{
@@ -1273,6 +1326,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object)
@@ -1283,6 +1336,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object)
wined3d_device_gl_create_dummy_textures(device_gl, context_gl);
wined3d_device_create_default_samplers(device, context);
@ -157,10 +157,10 @@ index d14b40d8e3e..995410e984d 100644
}
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index f79fa1571e6..85ef1c8ecd7 100644
index abbbf407f33..d0be8f975db 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -732,6 +732,113 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b
@@ -744,6 +744,113 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b
ERR("Unmapped sampler %u.\n", sampler_idx);
}
@ -274,7 +274,7 @@ index f79fa1571e6..85ef1c8ecd7 100644
/* Context activation is done by the caller. */
static void shader_glsl_load_samplers(const struct wined3d_context *context,
struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps)
@@ -2413,7 +2520,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
@@ -2551,7 +2658,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
break;
}
@ -285,7 +285,7 @@ index f79fa1571e6..85ef1c8ecd7 100644
shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, version, entry->bind_idx);
shader_addline(buffer, "uniform %s%s %s_sampler%u;\n",
sampler_type_prefix, sampler_type, prefix, entry->bind_idx);
@@ -7514,6 +7623,8 @@ static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *b
@@ -7652,6 +7761,8 @@ static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *b
static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer,
const struct wined3d_gl_info *gl_info)
{
@ -294,7 +294,7 @@ index f79fa1571e6..85ef1c8ecd7 100644
if (gl_info->supported[ARB_CULL_DISTANCE])
shader_addline(buffer, "#extension GL_ARB_cull_distance : enable\n");
if (gl_info->supported[ARB_GPU_SHADER5])
@@ -11519,6 +11630,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend =
@@ -11792,6 +11903,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend =
shader_glsl_get_caps,
shader_glsl_color_fixup_supported,
shader_glsl_has_ffp_proj_control,
@ -303,10 +303,10 @@ index f79fa1571e6..85ef1c8ecd7 100644
};
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 6282883ed04..51c95b73e9e 100644
index 68f9fe4cb90..132a1213518 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -3276,6 +3276,12 @@ static BOOL shader_none_has_ffp_proj_control(void *shader_priv)
@@ -3292,6 +3292,12 @@ static BOOL shader_none_has_ffp_proj_control(void *shader_priv)
return priv->ffp_proj_control;
}
@ -319,7 +319,7 @@ index 6282883ed04..51c95b73e9e 100644
static uint64_t shader_none_shader_compile(struct wined3d_context *context, const struct wined3d_shader_desc *shader_desc,
enum wined3d_shader_type shader_type)
{
@@ -3301,6 +3307,7 @@ const struct wined3d_shader_backend_ops none_shader_backend =
@@ -3317,6 +3323,7 @@ const struct wined3d_shader_backend_ops none_shader_backend =
shader_none_get_caps,
shader_none_color_fixup_supported,
shader_none_has_ffp_proj_control,
@ -328,10 +328,10 @@ index 6282883ed04..51c95b73e9e 100644
};
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index fdd2c70c667..5ebc012a20e 100644
index ae188ba4290..684d355bf8f 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1239,7 +1239,7 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_
@@ -1258,7 +1258,7 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_
}
/* Context activation is done by the caller. */
@ -340,7 +340,7 @@ index fdd2c70c667..5ebc012a20e 100644
struct wined3d_context_gl *context_gl, BOOL srgb)
{
const struct wined3d_format *format = texture_gl->t.resource.format;
@@ -1263,10 +1263,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
@@ -1282,10 +1282,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
target = texture_gl->target;
if (gl_tex->name)
@ -352,7 +352,7 @@ index fdd2c70c667..5ebc012a20e 100644
gl_info->gl_ops.gl.p_glGenTextures(1, &gl_tex->name);
checkGLcall("glGenTextures");
@@ -1275,7 +1272,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
@@ -1294,7 +1291,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
if (!gl_tex->name)
{
ERR("Failed to generate a texture name.\n");
@ -361,7 +361,7 @@ index fdd2c70c667..5ebc012a20e 100644
}
/* Initialise the state of the texture object to the OpenGL defaults, not
@@ -1359,6 +1356,15 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
@@ -1378,6 +1375,15 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl,
gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle);
checkGLcall("set format swizzle");
}
@ -378,10 +378,10 @@ index fdd2c70c667..5ebc012a20e 100644
/* Context activation is done by the caller. */
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 087aa21b75d..62a27535baa 100644
index 65d7bd67ada..90df50e2e7f 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -1201,6 +1201,36 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl
@@ -1248,6 +1248,36 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl
wined3d_sampler_gl_bind(sampler_gl, unit, texture_gl, context_gl);
}
@ -419,7 +419,7 @@ index 087aa21b75d..62a27535baa 100644
static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl,
struct wined3d_context_gl *context_gl)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 7b6fa50c5f0..a8186c169e0 100644
index 75c4cd732ab..ccc1ce2f0ff 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -42,6 +42,7 @@ enum wined3d_gl_extension
@ -431,10 +431,10 @@ index 7b6fa50c5f0..a8186c169e0 100644
ARB_BUFFER_STORAGE,
ARB_CLEAR_BUFFER_OBJECT,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 5b3eb0136b0..c28d3608ba5 100644
index bb6dcf78ae6..8a5ea778b3e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -95,6 +95,7 @@ struct wined3d_adapter;
@@ -88,6 +88,7 @@ struct wined3d_adapter;
struct wined3d_buffer_vk;
struct wined3d_context;
struct wined3d_context_vk;
@ -442,7 +442,7 @@ index 5b3eb0136b0..c28d3608ba5 100644
struct wined3d_gl_info;
struct wined3d_state;
struct wined3d_swapchain_gl;
@@ -1506,6 +1507,8 @@ struct wined3d_shader_backend_ops
@@ -1612,6 +1613,8 @@ struct wined3d_shader_backend_ops
void (*shader_get_caps)(const struct wined3d_adapter *adapter, struct shader_caps *caps);
BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup);
BOOL (*shader_has_ffp_proj_control)(void *shader_priv);
@ -451,7 +451,7 @@ index 5b3eb0136b0..c28d3608ba5 100644
uint64_t (*shader_compile)(struct wined3d_context *context, const struct wined3d_shader_desc *shader_desc,
enum wined3d_shader_type shader_type);
};
@@ -3825,6 +3828,21 @@ struct wined3d_dummy_textures
@@ -3962,6 +3965,21 @@ struct wined3d_dummy_textures
GLuint tex_2d_ms_array;
};
@ -473,7 +473,7 @@ index 5b3eb0136b0..c28d3608ba5 100644
#define WINED3D_UNMAPPED_STAGE ~0u
/* Multithreaded flag. Removed from the public header to signal that
@@ -3900,6 +3918,9 @@ struct wined3d_device
@@ -4037,6 +4055,9 @@ struct wined3d_device
struct wined3d_sampler *default_sampler;
struct wined3d_sampler *null_sampler;
@ -483,16 +483,16 @@ index 5b3eb0136b0..c28d3608ba5 100644
/* Command stream */
struct wined3d_cs *cs;
@@ -4569,6 +4590,8 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture,
@@ -4735,6 +4756,8 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture,
void wined3d_texture_get_bo_address(const struct wined3d_texture *texture,
unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) DECLSPEC_HIDDEN;
unsigned int sub_resource_idx, struct wined3d_bo_address *data, uint32_t location) DECLSPEC_HIDDEN;
GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN;
+GLuint wined3d_texture_get_name(struct wined3d_texture_gl *texture_gl,
+ struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN;
void wined3d_texture_invalidate_location(struct wined3d_texture *texture,
unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;
unsigned int sub_resource_idx, uint32_t location) DECLSPEC_HIDDEN;
void wined3d_texture_load(struct wined3d_texture *texture,
@@ -5372,6 +5395,8 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view
@@ -5547,6 +5570,8 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view
void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl,
struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;
@ -502,5 +502,5 @@ index 5b3eb0136b0..c28d3608ba5 100644
struct wined3d_view_vk
{
--
2.35.1
2.38.1