Module: wine Branch: master Commit: 9c895e2f047addefed78bc05c2d1693cfa0a33f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c895e2f047addefed78bc05c2d1693...
Author: Elizabeth Figura zfigura@codeweavers.com Date: Tue Apr 23 16:15:06 2024 -0500
wined3d: Remove the no longer used WINED3D_SHADER_CAP_SRGB_WRITE flag.
---
dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/shader_spirv.c | 3 +-- dlls/wined3d/utils.c | 19 +++++-------------- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 13ba1d65d13..ba61fe5a3cd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11368,7 +11368,6 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s /* Ideally we'd only set caps like sRGB writes here if supported by both * the shader backend and the fragment pipe, but we can get called before * shader_glsl_alloc(). */ - caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; if (shader_glsl_full_ffp_varyings(gl_info)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 37fc1cb22d1..110fdfeff39 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1076,8 +1076,7 @@ static void shader_spirv_get_caps(const struct wined3d_adapter *adapter, struct caps->ps_uniform_count = WINED3D_MAX_PS_CONSTS_F; caps->ps_1x_max_value = FLT_MAX; caps->varying_count = 0; - caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE - | WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; + caps->wined3d_caps = WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; }
static BOOL shader_spirv_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef95c40135a..e4ff36425ab 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3059,7 +3059,7 @@ static void query_view_class(struct wined3d_format_gl *format)
static void query_internal_format(struct wined3d_adapter *adapter, struct wined3d_format_gl *format, const struct wined3d_format_texture_info *texture_info, - struct wined3d_gl_info *gl_info, BOOL srgb_write_supported, BOOL srgb_format) + struct wined3d_gl_info *gl_info, BOOL srgb_format) { GLint count, multisample_types[8]; unsigned int i, max_log2; @@ -3078,12 +3078,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, { query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_READ, WINED3D_FORMAT_CAP_SRGB_READ, "sRGB read"); - - if (srgb_write_supported) - query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_WRITE, - WINED3D_FORMAT_CAP_SRGB_WRITE, "sRGB write"); - else - format_clear_caps(&format->f, WINED3D_FORMAT_CAP_SRGB_WRITE); + query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_WRITE, + WINED3D_FORMAT_CAP_SRGB_WRITE, "sRGB write");
if (!(format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3D_FORMAT_CAP_SRGB_READ | WINED3D_FORMAT_CAP_SRGB_WRITE))) @@ -3115,9 +3111,6 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->internal = format->srgb_internal; } } - - if ((format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_SRGB_WRITE) && !srgb_write_supported) - format_clear_caps(&format->f, WINED3D_FORMAT_CAP_SRGB_WRITE); }
if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) @@ -3170,11 +3163,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win struct fragment_caps fragment_caps; struct shader_caps shader_caps; unsigned int i, j; - BOOL srgb_write;
adapter->fragment_pipe->get_caps(adapter, &fragment_caps); adapter->shader_backend->shader_get_caps(adapter, &shader_caps); - srgb_write = (!shader_caps.ps_version || (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE));
for (i = 0; i < ARRAY_SIZE(format_texture_info); ++i) { @@ -3229,7 +3220,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win if (!gl_info->supported[ARB_SHADOW] && (format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_SHADOW)) format_clear_caps(&format->f, WINED3D_FORMAT_CAP_TEXTURE);
- query_internal_format(adapter, format, &format_texture_info[i], gl_info, srgb_write, FALSE); + query_internal_format(adapter, format, &format_texture_info[i], gl_info, FALSE);
/* Texture conversion stuff */ format->f.conv_byte_count = format_texture_info[i].conv_byte_count; @@ -3257,7 +3248,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win srgb_format->internal = format_texture_info[i].gl_srgb_internal; srgb_format->srgb_internal = format_texture_info[i].gl_srgb_internal; format_set_caps(&srgb_format->f, WINED3D_FORMAT_CAP_SRGB_READ | WINED3D_FORMAT_CAP_SRGB_WRITE); - query_internal_format(adapter, srgb_format, &format_texture_info[i], gl_info, srgb_write, TRUE); + query_internal_format(adapter, srgb_format, &format_texture_info[i], gl_info, TRUE); } }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2d1bab87b00..ea45e5ebdb3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1401,7 +1401,6 @@ 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_SRGB_WRITE 0x00000002u #define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u #define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u #define WINED3D_SHADER_CAP_FULL_FFP_VARYINGS 0x00000010u