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

wined3d: Get rid of the unused sampler_stages limit.

This commit is contained in:
Henri Verbeet 2012-07-15 15:44:58 +02:00 committed by Alexandre Julliard
parent 89a781adc9
commit adf66a338f
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/directx.c
View File

@ -2405,7 +2405,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
gl_info->limits.fragment_samplers = 1; gl_info->limits.fragment_samplers = 1;
gl_info->limits.vertex_samplers = 0; gl_info->limits.vertex_samplers = 0;
gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers;
gl_info->limits.sampler_stages = 1;
gl_info->limits.vertex_attribs = 16; gl_info->limits.vertex_attribs = 16;
gl_info->limits.glsl_vs_float_constants = 0; gl_info->limits.glsl_vs_float_constants = 0;
gl_info->limits.glsl_ps_float_constants = 0; gl_info->limits.glsl_ps_float_constants = 0;
@ -2761,11 +2760,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages;
TRACE("Max texture stages: %u.\n", gl_info->limits.texture_stages); TRACE("Max texture stages: %u.\n", gl_info->limits.texture_stages);
/* In some cases the number of texture stages can be larger than the number
* of samplers. The GF4 for example can use only 2 samplers (no fragment
* shaders), but 8 texture stages (register combiners). */
gl_info->limits.sampler_stages = max(gl_info->limits.fragment_samplers, gl_info->limits.texture_stages);
if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT])
{ {
gl_info->fbo_ops.glIsRenderbuffer = gl_info->glIsRenderbuffer; gl_info->fbo_ops.glIsRenderbuffer = gl_info->glIsRenderbuffer;

1
dlls/wined3d/wined3d_private.h
View File

@ -1479,7 +1479,6 @@ struct wined3d_gl_limits
UINT vertex_samplers; UINT vertex_samplers;
UINT combined_samplers; UINT combined_samplers;
UINT general_combiners; UINT general_combiners;
UINT sampler_stages;
UINT clipplanes; UINT clipplanes;
UINT texture_size; UINT texture_size;
UINT texture3d_size; UINT texture3d_size;