system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 12:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Pass a wined3d_adapter instead of wined3d_gl_info to FFP pipe emulation mask methods.

Browse source
This commit is contained in:
Zebediah Figura 2023-01-06 16:09:29 -06:00 committed by Alexandre Julliard
parent 35b8bcf7d5
commit 965023386a
8 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/wined3d/adapter_gl.c
View file

@ -3880,8 +3880,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter_gl *adapter_gl,
}
}
gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info)
| adapter->fragment_pipe->get_emul_mask(gl_info);
gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(adapter)
| adapter->fragment_pipe->get_emul_mask(adapter);
if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE)
install_gl_compat_wrapper(gl_info, ARB_MULTITEXTURE);
if (gl_ext_emul_mask & GL_EXT_EMUL_EXT_FOG_COORD)

2
dlls/wined3d/arb_program_shader.c
View file

@ -5802,7 +5802,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen
caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES);
}
static unsigned int arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int arbfp_get_emul_mask(const struct wined3d_adapter *adapter)
{
return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD;
}

2
dlls/wined3d/ati_fragment_shader.c
View file

@ -1315,7 +1315,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen
caps->MaxSimultaneousTextures = 6;
}
static unsigned int atifs_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int atifs_get_emul_mask(const struct wined3d_adapter *adapter)
{
return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD;
}

8
dlls/wined3d/glsl_shader.c
View file

@ -11570,9 +11570,9 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter,
caps->raster_caps = WINED3DPRASTERCAPS_FOGRANGE;
}
static unsigned int glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_adapter *adapter)
{
if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])
if (wined3d_adapter_gl_const(adapter)->gl_info.supported[WINED3D_GL_LEGACY_CONTEXT])
return GL_EXT_EMUL_ARB_MULTITEXTURE;
return 0;
}
@ -12083,9 +12083,9 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s
caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES);
}
static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_adapter *adapter)
{
if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])
if (wined3d_adapter_gl_const(adapter)->gl_info.supported[WINED3D_GL_LEGACY_CONTEXT])
return GL_EXT_EMUL_ARB_MULTITEXTURE;
return 0;
}

2
dlls/wined3d/nvidia_texture_shader.c
View file

@ -750,7 +750,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct
caps->MaxSimultaneousTextures = gl_info->limits.textures;
}
static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_adapter *adapter)
{
return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD;
}

4
dlls/wined3d/shader_spirv.c
View file

@ -1104,7 +1104,7 @@ static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapt
caps->ffp_generic_attributes = TRUE;
}
static unsigned int spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_adapter *adapter)
{
return 0;
}
@ -1178,7 +1178,7 @@ static void spirv_fragment_pipe_vk_fp_get_caps(const struct wined3d_adapter *ada
memset(caps, 0, sizeof(*caps));
}
static unsigned int spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_adapter *adapter)
{
return 0;
}

8
dlls/wined3d/state.c
View file

@ -5130,7 +5130,7 @@ static void vp_ffp_get_caps(const struct wined3d_adapter *adapter, struct wined3
caps->raster_caps |= WINED3DPRASTERCAPS_FOGRANGE;
}
static unsigned int vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int vp_ffp_get_emul_mask(const struct wined3d_adapter *adapter)
{
return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD;
}
@ -5188,7 +5188,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct
caps->MaxSimultaneousTextures = gl_info->limits.textures;
}
static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_adapter *adapter)
{
return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD;
}
@ -5235,7 +5235,7 @@ static void vp_none_get_caps(const struct wined3d_adapter *adapter, struct wined
memset(caps, 0, sizeof(*caps));
}
static unsigned int vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int vp_none_get_emul_mask(const struct wined3d_adapter *adapter)
{
return 0;
}
@ -5255,7 +5255,7 @@ static void fp_none_get_caps(const struct wined3d_adapter *adapter, struct fragm
memset(caps, 0, sizeof(*caps));
}
static unsigned int fp_none_get_emul_mask(const struct wined3d_gl_info *gl_info)
static unsigned int fp_none_get_emul_mask(const struct wined3d_adapter *adapter)
{
return 0;
}

4
dlls/wined3d/wined3d_private.h
View file

@ -2013,7 +2013,7 @@ struct wined3d_fragment_pipe_ops
{
void (*fp_enable)(const struct wined3d_context *context, BOOL enable);
void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps);
unsigned int (*get_emul_mask)(const struct wined3d_gl_info *gl_info);
unsigned int (*get_emul_mask)(const struct wined3d_adapter *adapter);
void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv);
void (*free_private)(struct wined3d_device *device, struct wined3d_context *context);
BOOL (*allocate_context_data)(struct wined3d_context *context);
@ -2040,7 +2040,7 @@ struct wined3d_vertex_pipe_ops
{
void (*vp_enable)(const struct wined3d_context *context, BOOL enable);
void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps);
unsigned int (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info);
unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter);
void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv);
void (*vp_free)(struct wined3d_device *device, struct wined3d_context *context);
const struct wined3d_state_entry_template *vp_states;