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
596bf1c6
Commit
596bf1c6
authored
Mar 23, 2023
by
Max Figura
Committed by
Alexandre Julliard
Mar 24, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move the WINED3D_RS_ADAPTIVETESS_W stub to wined3d_device_apply_stateblock.
parent
c90d3bfc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
8 deletions
+1
-8
adapter_vk.c
dlls/wined3d/adapter_vk.c
+0
-1
device.c
dlls/wined3d/device.c
+0
-4
directx.c
dlls/wined3d/directx.c
+0
-1
state.c
dlls/wined3d/state.c
+1
-2
No files found.
dlls/wined3d/adapter_vk.c
View file @
596bf1c6
...
...
@@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
{
STATE_INDEXBUFFER
,
{
STATE_INDEXBUFFER
,
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_ADAPTIVETESS_W
),
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
)}},
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
state_nop
}},
/* Samplers */
...
...
dlls/wined3d/device.c
View file @
596bf1c6
...
...
@@ -4034,12 +4034,8 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case
WINED3D_RS_ADAPTIVETESS_X
:
case
WINED3D_RS_ADAPTIVETESS_Z
:
set_depth_bounds
=
true
;
break
;
case
WINED3D_RS_ADAPTIVETESS_W
:
set_depth_bounds
=
true
;
wined3d_device_set_render_state
(
device
,
idx
,
state
->
rs
[
idx
]);
break
;
case
WINED3D_RS_ADAPTIVETESS_Y
:
...
...
dlls/wined3d/directx.c
View file @
596bf1c6
...
...
@@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ZFUNC
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ADAPTIVETESS_W
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
{
STATE_VDECL
}},
/* Samplers */
...
...
dlls/wined3d/state.c
View file @
596bf1c6
...
...
@@ -4589,7 +4589,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
state_linepattern
},
WINED3D_GL_LEGACY_CONTEXT
},
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
state_linepattern_w
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
state_ditherenable
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_ADAPTIVETESS_W
),
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
state_tessellation
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
state_msaa
},
ARB_MULTISAMPLE
},
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
state_msaa_w
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5359,7 +5358,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
{
149
,
150
},
{
153
,
153
},
{
162
,
165
},
{
167
,
18
2
},
{
167
,
18
3
},
{
185
,
193
},
{
195
,
209
},
{
0
,
0
},
...
...
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