Commit 0c4bb266 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wined3d: Remove WINED3D_TEXTURE_NORMALIZED_COORDS.

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 012f9b03 [which changed the relevant code to use wined3d_context_gl_draw_textured_quad() instead], and cdacbd98 [which removed the relevant code entirely.]
parent 37a60f58
...@@ -3955,8 +3955,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc ...@@ -3955,8 +3955,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc
texture->layer_count = layer_count; texture->layer_count = layer_count;
texture->level_count = level_count; texture->level_count = level_count;
texture->lod = 0; texture->lod = 0;
texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_DOWNLOADABLE;
| WINED3D_TEXTURE_DOWNLOADABLE;
if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)
{ {
texture->flags |= WINED3D_TEXTURE_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 ...@@ -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[0] = (float)desc->width;
texture->pow2_matrix[5] = (float)desc->height; 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) else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)
{ {
......
...@@ -3311,7 +3311,6 @@ struct wined3d_texture_ops ...@@ -3311,7 +3311,6 @@ struct wined3d_texture_ops
#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040 #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040
#define WINED3D_TEXTURE_SRGB_VALID 0x00000080 #define WINED3D_TEXTURE_SRGB_VALID 0x00000080
#define WINED3D_TEXTURE_CONVERTED 0x00000100 #define WINED3D_TEXTURE_CONVERTED 0x00000100
#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400
#define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800 #define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800
#define WINED3D_TEXTURE_DC_IN_USE 0x00001000 #define WINED3D_TEXTURE_DC_IN_USE 0x00001000
#define WINED3D_TEXTURE_DISCARD 0x00002000 #define WINED3D_TEXTURE_DISCARD 0x00002000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment