"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "dlls/wined3d/utils.c" between
wine-5.12.tar.xz and wine-5.13.tar.xz

About: Wine is an Open Source implementation of the MS Windows API on top of X, OpenGL, and Unix. Think of Wine as a compatibility layer for running Windows programs. Development release.

utils.c  (wine-5.12.tar.xz):utils.c  (wine-5.13.tar.xz)
skipping to change at line 3037 skipping to change at line 3037
format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_READ | WINED3 DFMT_FLAG_SRGB_WRITE); format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_READ | WINED3 DFMT_FLAG_SRGB_WRITE);
} }
else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE])
{ {
format->internal = format->srgb_internal; format->internal = format->srgb_internal;
} }
} }
if ((format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_ WRITE) && !srgb_write_supported) if ((format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_ WRITE) && !srgb_write_supported)
format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_WRITE); format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_WRITE);
}
if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || f if ((!gl_info->supported[ARB_DEPTH_TEXTURE] || wined3d_settings.offscreen_re
ormat->f.stencil_size)) ndering_mode != ORM_FBO)
{ && (format->f.depth_size || format->f.stencil_size))
format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXT {
URE; TRACE("Disabling texturing support for depth / stencil format %s.\n", de
format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXT bug_d3dformat(format->f.id));
URE; format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE;
format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXT format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE;
URE; format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE;
format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TE format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TEXTUR
XTURE; E;
format->f.flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TE format->f.flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TEXTUR
XTURE; E;
}
} }
query_view_class(format); query_view_class(format);
if (format->internal && format->f.flags[WINED3D_GL_RES_TYPE_RB] if (format->internal && format->f.flags[WINED3D_GL_RES_TYPE_RB]
& (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL)) & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL))
{ {
if (gl_info->supported[ARB_INTERNALFORMAT_QUERY]) if (gl_info->supported[ARB_INTERNALFORMAT_QUERY])
{ {
target = gl_info->supported[ARB_TEXTURE_MULTISAMPLE] ? GL_TEXTURE_2D _MULTISAMPLE : GL_RENDERBUFFER; target = gl_info->supported[ARB_TEXTURE_MULTISAMPLE] ? GL_TEXTURE_2D _MULTISAMPLE : GL_RENDERBUFFER;
skipping to change at line 5722 skipping to change at line 5724
break; break;
default: default:
/* This should not happen, context->fog_source is set in wined3d, no t the app. */ /* This should not happen, context->fog_source is set in wined3d, no t the app. */
ERR("Unexpected fog coordinate source.\n"); ERR("Unexpected fog coordinate source.\n");
*start = 0.0f; *start = 0.0f;
*end = 0.0f; *end = 0.0f;
} }
} }
static BOOL wined3d_get_primary_display(WCHAR *display)
{
DISPLAY_DEVICEW display_device;
DWORD device_idx = 0;
display_device.cb = sizeof(display_device);
while (EnumDisplayDevicesW(NULL, device_idx++, &display_device, 0))
{
if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
{
lstrcpyW(display, display_device.DeviceName);
return TRUE;
}
}
return FALSE;
}
BOOL wined3d_get_primary_adapter_luid(LUID *luid)
{
D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_param;
D3DKMT_CLOSEADAPTER close_adapter_param;
if (!wined3d_get_primary_display(open_adapter_param.DeviceName))
return FALSE;
if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_param))
return FALSE;
*luid = open_adapter_param.AdapterLuid;
close_adapter_param.hAdapter = open_adapter_param.hAdapter;
D3DKMTCloseAdapter(&close_adapter_param);
return TRUE;
}
/* Note: It's the caller's responsibility to ensure values can be expressed /* Note: It's the caller's responsibility to ensure values can be expressed
* in the requested format. UNORM formats for example can only express values * in the requested format. UNORM formats for example can only express values
* in the range 0.0f -> 1.0f. */ * in the range 0.0f -> 1.0f. */
DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con st struct wined3d_color *color) DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con st struct wined3d_color *color)
{ {
static const struct static const struct
{ {
enum wined3d_format_id format_id; enum wined3d_format_id format_id;
struct wined3d_vec4 mul; struct wined3d_vec4 mul;
struct wined3d_uvec4 shift; struct wined3d_uvec4 shift;
 End of changes. 3 change blocks. 
14 lines changed or deleted 49 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)