Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
efb0d67a
Commit
efb0d67a
authored
Mar 20, 2023
by
Zebediah Figura
Committed by
Alexandre Julliard
Oct 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Rename the "MaxTextureBlendStages" field of struct fragment_caps to "max_blend_stages".
parent
82873b72
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9 additions
and
9 deletions
+9
-9
adapter_gl.c
dlls/wined3d/adapter_gl.c
+1
-1
adapter_vk.c
dlls/wined3d/adapter_vk.c
+1
-1
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
ati_fragment_shader.c
dlls/wined3d/ati_fragment_shader.c
+1
-1
directx.c
dlls/wined3d/directx.c
+1
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+1
-1
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+1
-1
state.c
dlls/wined3d/state.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/adapter_gl.c
View file @
efb0d67a
...
...
@@ -5190,7 +5190,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_
d3d_info
->
limits
.
ps_uniform_count
=
shader_caps
.
ps_uniform_count
;
d3d_info
->
limits
.
varying_count
=
shader_caps
.
varying_count
;
d3d_info
->
limits
.
ffp_textures
=
fragment_caps
.
max_textures
;
d3d_info
->
limits
.
ffp_blend_stages
=
fragment_caps
.
MaxTextureBlendS
tages
;
d3d_info
->
limits
.
ffp_blend_stages
=
fragment_caps
.
max_blend_s
tages
;
TRACE
(
"Max texture stages: %u.
\n
"
,
d3d_info
->
limits
.
ffp_blend_stages
);
d3d_info
->
limits
.
ffp_vertex_blend_matrices
=
vertex_caps
.
max_vertex_blend_matrices
;
d3d_info
->
limits
.
active_light_count
=
vertex_caps
.
max_active_lights
;
...
...
dlls/wined3d/adapter_vk.c
View file @
efb0d67a
...
...
@@ -2320,7 +2320,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_
d3d_info
->
limits
.
ps_uniform_count
=
shader_caps
.
ps_uniform_count
;
d3d_info
->
limits
.
varying_count
=
shader_caps
.
varying_count
;
d3d_info
->
limits
.
ffp_textures
=
fragment_caps
.
max_textures
;
d3d_info
->
limits
.
ffp_blend_stages
=
fragment_caps
.
MaxTextureBlendS
tages
;
d3d_info
->
limits
.
ffp_blend_stages
=
fragment_caps
.
max_blend_s
tages
;
d3d_info
->
limits
.
ffp_vertex_blend_matrices
=
vertex_caps
.
max_vertex_blend_matrices
;
d3d_info
->
limits
.
active_light_count
=
vertex_caps
.
max_active_lights
;
...
...
dlls/wined3d/arb_program_shader.c
View file @
efb0d67a
...
...
@@ -5795,7 +5795,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen
/* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */
caps
->
MaxTextureBlendStages
=
WINED3D_MAX_FFP_TEXTURES
;
caps
->
max_blend_stages
=
WINED3D_MAX_FFP_TEXTURES
;
caps
->
max_textures
=
min
(
gl_info
->
limits
.
samplers
[
WINED3D_SHADER_TYPE_PIXEL
],
WINED3D_MAX_FFP_TEXTURES
);
}
...
...
dlls/wined3d/ati_fragment_shader.c
View file @
efb0d67a
...
...
@@ -1312,7 +1312,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen
* The proper fix for this is not to use GL_ATI_fragment_shader on cards newer than the
* r200 series and use an ARB or GLSL shader instead
*/
caps
->
MaxTextureBlendStages
=
WINED3D_MAX_FFP_TEXTURES
;
caps
->
max_blend_stages
=
WINED3D_MAX_FFP_TEXTURES
;
caps
->
max_textures
=
6
;
}
...
...
dlls/wined3d/directx.c
View file @
efb0d67a
...
...
@@ -2529,7 +2529,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter,
caps
->
PixelShader1xMaxValue
=
shader_caps
.
ps_1x_max_value
;
caps
->
TextureOpCaps
=
fragment_caps
.
TextureOpCaps
;
caps
->
MaxTextureBlendStages
=
fragment_caps
.
MaxTextureBlendS
tages
;
caps
->
MaxTextureBlendStages
=
fragment_caps
.
max_blend_s
tages
;
caps
->
MaxSimultaneousTextures
=
fragment_caps
.
max_textures
;
caps
->
MaxUserClipPlanes
=
vertex_caps
.
max_user_clip_planes
;
...
...
dlls/wined3d/glsl_shader.c
View file @
efb0d67a
...
...
@@ -12080,7 +12080,7 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s
|
WINED3DTEXOPCAPS_LERP
|
WINED3DTEXOPCAPS_BUMPENVMAP
|
WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE
;
caps
->
MaxTextureBlendS
tages
=
WINED3D_MAX_FFP_TEXTURES
;
caps
->
max_blend_s
tages
=
WINED3D_MAX_FFP_TEXTURES
;
caps
->
max_textures
=
min
(
gl_info
->
limits
.
samplers
[
WINED3D_SHADER_TYPE_PIXEL
],
WINED3D_MAX_FFP_TEXTURES
);
}
...
...
dlls/wined3d/nvidia_texture_shader.c
View file @
efb0d67a
...
...
@@ -747,7 +747,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct
WINED3DTEXOPCAPS_PREMODULATE */
#endif
caps
->
MaxTextureBlendS
tages
=
min
(
WINED3D_MAX_FFP_TEXTURES
,
gl_info
->
limits
.
general_combiners
);
caps
->
max_blend_s
tages
=
min
(
WINED3D_MAX_FFP_TEXTURES
,
gl_info
->
limits
.
general_combiners
);
caps
->
max_textures
=
gl_info
->
limits
.
ffp_textures
;
}
...
...
dlls/wined3d/state.c
View file @
efb0d67a
...
...
@@ -5185,7 +5185,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct
if
(
gl_info
->
supported
[
ARB_TEXTURE_ENV_DOT3
])
caps
->
TextureOpCaps
|=
WINED3DTEXOPCAPS_DOTPRODUCT3
;
caps
->
MaxTextureBlendS
tages
=
gl_info
->
limits
.
ffp_textures
;
caps
->
max_blend_s
tages
=
gl_info
->
limits
.
ffp_textures
;
caps
->
max_textures
=
gl_info
->
limits
.
ffp_textures
;
}
...
...
dlls/wined3d/wined3d_private.h
View file @
efb0d67a
...
...
@@ -1997,7 +1997,7 @@ struct fragment_caps
DWORD
wined3d_caps
;
DWORD
PrimitiveMiscCaps
;
DWORD
TextureOpCaps
;
DWORD
MaxTextureBlendS
tages
;
unsigned
int
max_blend_s
tages
;
unsigned
int
max_textures
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment