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
462ddaa2
Commit
462ddaa2
authored
Aug 21, 2008
by
Stefan Dösinger
Committed by
Alexandre Julliard
Aug 27, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Make the texture stage mapping nvrc independent.
parent
0e2713a1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
device.c
dlls/wined3d/device.c
+2
-1
directx.c
dlls/wined3d/directx.c
+1
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/device.c
View file @
462ddaa2
...
@@ -3750,7 +3750,8 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) {
...
@@ -3750,7 +3750,8 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) {
device_update_fixed_function_usage_map
(
This
);
device_update_fixed_function_usage_map
(
This
);
if
(
!
GL_SUPPORT
(
NV_REGISTER_COMBINERS
)
||
This
->
stateBlock
->
lowest_disabled_stage
<=
This
->
max_ffp_textures
)
{
if
(
This
->
max_ffp_textures
==
This
->
max_ffp_texture_stages
||
This
->
stateBlock
->
lowest_disabled_stage
<=
This
->
max_ffp_textures
)
{
for
(
i
=
0
;
i
<
This
->
stateBlock
->
lowest_disabled_stage
;
++
i
)
{
for
(
i
=
0
;
i
<
This
->
stateBlock
->
lowest_disabled_stage
;
++
i
)
{
if
(
!
This
->
fixed_function_usage_map
[
i
])
continue
;
if
(
!
This
->
fixed_function_usage_map
[
i
])
continue
;
...
...
dlls/wined3d/directx.c
View file @
462ddaa2
...
@@ -3608,6 +3608,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter,
...
@@ -3608,6 +3608,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter,
object
->
frag_pipe
=
frag_pipeline
;
object
->
frag_pipe
=
frag_pipeline
;
frag_pipeline
->
get_caps
(
DeviceType
,
&
GLINFO_LOCATION
,
&
ffp_caps
);
frag_pipeline
->
get_caps
(
DeviceType
,
&
GLINFO_LOCATION
,
&
ffp_caps
);
object
->
max_ffp_textures
=
ffp_caps
.
MaxSimultaneousTextures
;
object
->
max_ffp_textures
=
ffp_caps
.
MaxSimultaneousTextures
;
object
->
max_ffp_texture_stages
=
ffp_caps
.
MaxTextureBlendStages
;
compile_state_table
(
object
->
StateTable
,
object
->
multistate_funcs
,
&
GLINFO_LOCATION
,
compile_state_table
(
object
->
StateTable
,
object
->
multistate_funcs
,
&
GLINFO_LOCATION
,
ffp_vertexstate_template
,
frag_pipeline
,
misc_state_template
);
ffp_vertexstate_template
,
frag_pipeline
,
misc_state_template
);
...
...
dlls/wined3d/wined3d_private.h
View file @
462ddaa2
...
@@ -859,7 +859,7 @@ struct IWineD3DDeviceImpl
...
@@ -859,7 +859,7 @@ struct IWineD3DDeviceImpl
const
struct
fragment_pipeline
*
frag_pipe
;
const
struct
fragment_pipeline
*
frag_pipe
;
const
struct
blit_shader
*
blitter
;
const
struct
blit_shader
*
blitter
;
unsigned
int
max_ffp_textures
;
unsigned
int
max_ffp_textures
,
max_ffp_texture_stages
;
/* To store */
/* To store */
BOOL
view_ident
;
/* true iff view matrix is identity */
BOOL
view_ident
;
/* true iff view matrix is identity */
...
...
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