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
5e78a83c
Commit
5e78a83c
authored
Jul 01, 2007
by
H. Verbeet
Committed by
Alexandre Julliard
Jul 02, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Call IWineD3DDeviceImpl_FindTexUnitMap for cards without support for…
wined3d: Call IWineD3DDeviceImpl_FindTexUnitMap for cards without support for NV_REGISTER_COMBINERS as well.
parent
fd133237
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
context.c
dlls/wined3d/context.c
+3
-3
device.c
dlls/wined3d/device.c
+2
-4
No files found.
dlls/wined3d/context.c
View file @
5e78a83c
...
...
@@ -807,9 +807,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU
glEnable
(
GL_TEXTURE_SHADER_NV
);
checkGLcall
(
"glEnable(GL_TEXTURE_SHADER_NV)"
);
}
if
(
GL_SUPPORT
(
NV_REGISTER_COMBINERS
))
{
IWineD3DDeviceImpl_FindTexUnitMap
(
This
);
}
IWineD3DDeviceImpl_FindTexUnitMap
(
This
);
for
(
i
=
0
;
i
<
context
->
numDirtyEntries
;
i
++
)
{
dirtyState
=
context
->
dirtyArray
[
i
];
idx
=
dirtyState
>>
5
;
...
...
dlls/wined3d/device.c
View file @
5e78a83c
...
...
@@ -3261,7 +3261,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) {
device_update_fixed_function_usage_map
(
This
);
if
(
This
->
stateBlock
->
lowest_disabled_stage
<=
GL_LIMITS
(
textures
))
{
if
(
!
GL_SUPPORT
(
NV_REGISTER_COMBINERS
)
||
This
->
stateBlock
->
lowest_disabled_stage
<=
GL_LIMITS
(
textures
))
{
for
(
i
=
0
;
i
<
This
->
stateBlock
->
lowest_disabled_stage
;
++
i
)
{
if
(
!
This
->
fixed_function_usage_map
[
i
])
continue
;
...
...
@@ -3368,9 +3368,7 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) {
void
IWineD3DDeviceImpl_FindTexUnitMap
(
IWineD3DDeviceImpl
*
This
)
{
BOOL
vs
=
use_vs
(
This
);
BOOL
ps
=
use_ps
(
This
);
/* This code can assume that GL_NV_register_combiners are supported, otherwise
* it is never called.
*
/*
* Rules are:
* -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but
* that would be really messy and require shader recompilation
...
...
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