marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of the "Multisampling" setting. 

There should be no reason to set this anymore. Note that "SampleCount" can be
used to force a specific sample count.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Henri Verbeet 2017-04-23 17:57:27 +02:00 committed by Alexandre Julliard
parent 546be1b80b
commit c09bb22c81
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/directx.c
View File

@ -3710,8 +3710,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info)
else
gl_info->limits.shininess = 128.0f;
if ((gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE])
&& wined3d_settings.allow_multisampling)
if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE])
{
gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_SAMPLES, &gl_max);
gl_info->limits.samples = gl_max;

9
dlls/wined3d/wined3d_main.c
View File

@ -80,7 +80,6 @@ struct wined3d_settings wined3d_settings =
PCI_DEVICE_NONE,/* PCI Device ID */
0, /* The default of memory is set in init_driver_info */
NULL, /* No wine logo by default */
TRUE, /* Multisampling enabled by default. */
~0u, /* Don't force a specific sample count by default. */
FALSE, /* No strict draw ordering. */
FALSE, /* Don't range check relative addressing indices in float constants. */
@ -289,14 +288,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n");
else memcpy(wined3d_settings.logo, buffer, len);
}
if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) )
{
if (!strcmp(buffer, "disabled"))
{
TRACE("Multisampling disabled.\n");
wined3d_settings.allow_multisampling = FALSE;
}
}
if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count))
ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n",
wined3d_settings.sample_count);

1
dlls/wined3d/wined3d_private.h
View File

@ -388,7 +388,6 @@ struct wined3d_settings
/* Memory tracking and object counting. */
UINT64 emulated_textureram;
char *logo;
int allow_multisampling;
unsigned int sample_count;
BOOL strict_draw_ordering;
BOOL check_float_constants;