Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
b59dd0e4
Commit
b59dd0e4
authored
Feb 04, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 05, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add the general combiner limit to wined3d_gl_info.
parent
8350aafd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
directx.c
dlls/wined3d/directx.c
+2
-0
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+1
-1
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+1
-0
No files found.
dlls/wined3d/directx.c
View file @
b59dd0e4
...
...
@@ -1923,7 +1923,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter)
{
GLint
tmp
;
glGetIntegerv
(
GL_MAX_GENERAL_COMBINERS_NV
,
&
tmp
);
gl_info
->
limits
.
general_combiners
=
tmp
;
gl_info
->
limits
.
texture_stages
=
min
(
MAX_TEXTURES
,
tmp
);
TRACE_
(
d3d_caps
)(
"Max general combiners: %d.
\n
"
,
tmp
);
}
else
{
...
...
dlls/wined3d/nvidia_texture_shader.c
View file @
b59dd0e4
...
...
@@ -670,7 +670,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct
WINED3DTEXOPCAPS_PREMODULATE */
#endif
pCaps
->
MaxTextureBlendStages
=
gl_info
->
limits
.
texture_stages
;
pCaps
->
MaxTextureBlendStages
=
min
(
MAX_TEXTURES
,
gl_info
->
limits
.
general_combiners
)
;
pCaps
->
MaxSimultaneousTextures
=
gl_info
->
limits
.
textures
;
pCaps
->
PrimitiveMiscCaps
|=
WINED3DPMISCCAPS_TSSARGTEMP
;
...
...
dlls/wined3d/wined3d_gl.h
View file @
b59dd0e4
...
...
@@ -4619,6 +4619,7 @@ struct wined3d_gl_limits
UINT
fragment_samplers
;
UINT
vertex_samplers
;
UINT
combined_samplers
;
UINT
general_combiners
;
UINT
sampler_stages
;
UINT
clipplanes
;
UINT
texture_size
;
...
...
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