system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 16:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Remove WINED3D_TEXTURE_NORMALIZED_COORDS.

Browse source 
This is no longer used. It was previously used in two places to perform
an open-coded wined3d_context_gl_draw_textured_quad(), but the latter checks
wined3d_texture_gl.target instead, which is set to GL_TEXTURE_2D or
GL_TEXTURE_RECTANGLE_ARB under the exact same conditions, making this flag
redundant even at the time.

The two uses were removed in 012f9b03f8 [which changed the relevant code to use
wined3d_context_gl_draw_textured_quad() instead], and cdacbd985 [which removed
the relevant code entirely.]
This commit is contained in:
Zebediah Figura 2022-12-10 17:14:00 -06:00 committed by Alexandre Julliard
parent 37a60f580c
commit 0c4bb26639
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/wined3d/texture.c
View file

@ -3955,8 +3955,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc
texture->layer_count = layer_count;
texture->level_count = level_count;
texture->lod = 0;
texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS
| WINED3D_TEXTURE_DOWNLOADABLE;
texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_DOWNLOADABLE;
if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)
{
texture->flags |= WINED3D_TEXTURE_GET_DC_LENIENT;
@ -3991,7 +3990,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc
{
texture->pow2_matrix[0] = (float)desc->width;
texture->pow2_matrix[5] = (float)desc->height;
texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS);
texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT;
}
else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)
{

1
dlls/wined3d/wined3d_private.h
View file

@ -3311,7 +3311,6 @@ struct wined3d_texture_ops
#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040
#define WINED3D_TEXTURE_SRGB_VALID 0x00000080
#define WINED3D_TEXTURE_CONVERTED 0x00000100
#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400
#define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800
#define WINED3D_TEXTURE_DC_IN_USE 0x00001000
#define WINED3D_TEXTURE_DISCARD 0x00002000