ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Move "texture_size" from struct wined3d_gl_limits to struct wined3d_d3d_limits. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-09-26 00:44:37 +03:30 committed by Alexandre Julliard
parent 8aa30cd793
commit a470045506
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/adapter_gl.c
View File

@ -2853,7 +2853,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct
} }
gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max);
gl_info->limits.texture_size = gl_max; d3d_info->limits.texture_size = gl_max;
TRACE("Maximum texture size support - max texture size %d.\n", gl_max); TRACE("Maximum texture size support - max texture size %d.\n", gl_max);
gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]
@ -3143,8 +3143,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct
} }
else else
{ {
gl_info->limits.framebuffer_width = gl_info->limits.texture_size; gl_info->limits.framebuffer_width = d3d_info->limits.texture_size;
gl_info->limits.framebuffer_height = gl_info->limits.texture_size; gl_info->limits.framebuffer_height = d3d_info->limits.texture_size;
} }
gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] =

6
dlls/wined3d/directx.c
View File

@ -2136,8 +2136,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
* idea how generating the smoothing alpha values works; the result is different * idea how generating the smoothing alpha values works; the result is different
*/ */
caps->MaxTextureWidth = gl_info->limits.texture_size; caps->MaxTextureWidth = d3d_info->limits.texture_size;
caps->MaxTextureHeight = gl_info->limits.texture_size; caps->MaxTextureHeight = d3d_info->limits.texture_size;
if (gl_info->supported[EXT_TEXTURE3D]) if (gl_info->supported[EXT_TEXTURE3D])
caps->MaxVolumeExtent = gl_info->limits.texture3d_size; caps->MaxVolumeExtent = gl_info->limits.texture3d_size;
@ -2145,7 +2145,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
caps->MaxVolumeExtent = 0; caps->MaxVolumeExtent = 0;
caps->MaxTextureRepeat = 32768; caps->MaxTextureRepeat = 32768;
caps->MaxTextureAspectRatio = gl_info->limits.texture_size; caps->MaxTextureAspectRatio = d3d_info->limits.texture_size;
caps->MaxVertexW = 1.0f; caps->MaxVertexW = 1.0f;
caps->GuardBandLeft = 0.0f; caps->GuardBandLeft = 0.0f;

2
dlls/wined3d/texture.c
View File

@ -2687,7 +2687,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc
texture->pow2_width = pow2_width; texture->pow2_width = pow2_width;
texture->pow2_height = pow2_height; texture->pow2_height = pow2_height;
if ((pow2_width > gl_info->limits.texture_size || pow2_height > gl_info->limits.texture_size) if ((pow2_width > d3d_info->limits.texture_size || pow2_height > d3d_info->limits.texture_size)
&& (desc->usage & WINED3DUSAGE_TEXTURE)) && (desc->usage & WINED3DUSAGE_TEXTURE))
{ {
/* One of four options: /* One of four options:

2
dlls/wined3d/wined3d_private.h
View File

@ -166,6 +166,7 @@ struct wined3d_d3d_limits
unsigned int max_rt_count; unsigned int max_rt_count;
unsigned int max_clip_distances; unsigned int max_clip_distances;
unsigned int texture_size;
float pointsize_max; float pointsize_max;
}; };
@ -2540,7 +2541,6 @@ struct wined3d_gl_limits
unsigned int combined_samplers; unsigned int combined_samplers;
UINT general_combiners; UINT general_combiners;
UINT user_clip_distances; UINT user_clip_distances;
UINT texture_size;
UINT texture3d_size; UINT texture3d_size;
UINT anisotropy; UINT anisotropy;
float shininess; float shininess;