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
43454f9a
Commit
43454f9a
authored
Dec 13, 2022
by
Max Figura
Committed by
Alexandre Julliard
Mar 21, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move the WINED3D_RS_POSITIONDEGREE stub to wined3d_device_apply_stateblock.
parent
ff8f7874
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
11 deletions
+7
-11
adapter_vk.c
dlls/wined3d/adapter_vk.c
+0
-1
device.c
dlls/wined3d/device.c
+6
-0
directx.c
dlls/wined3d/directx.c
+0
-1
state.c
dlls/wined3d/state.c
+1
-9
No files found.
dlls/wined3d/adapter_vk.c
View file @
43454f9a
...
...
@@ -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_POSITIONDEGREE
),
{
STATE_RENDER
(
WINED3D_RS_POSITIONDEGREE
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_NORMALDEGREE
),
{
STATE_RENDER
(
WINED3D_RS_NORMALDEGREE
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_MINTESSELLATIONLEVEL
),
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
)}},
{
STATE_RENDER
(
WINED3D_RS_MAXTESSELLATIONLEVEL
),
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
)}},
...
...
dlls/wined3d/device.c
View file @
43454f9a
...
...
@@ -4210,6 +4210,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case
WINED3D_RS_TWEENFACTOR
:
break
;
case
WINED3D_RS_POSITIONDEGREE
:
if
(
state
->
rs
[
WINED3D_RS_POSITIONDEGREE
]
!=
WINED3D_DEGREE_CUBIC
)
FIXME
(
"WINED3D_RS_POSITIONDEGREE %#x not yet implemented.
\n
"
,
state
->
rs
[
WINED3D_RS_POSITIONDEGREE
]);
break
;
default:
wined3d_device_set_render_state
(
device
,
idx
,
state
->
rs
[
idx
]);
break
;
...
...
dlls/wined3d/directx.c
View file @
43454f9a
...
...
@@ -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_POSITIONDEGREE
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_NORMALDEGREE
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_MINTESSELLATIONLEVEL
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_MAXTESSELLATIONLEVEL
),
{
STATE_VDECL
}},
...
...
dlls/wined3d/state.c
View file @
43454f9a
...
...
@@ -1965,13 +1965,6 @@ static void state_sample_mask_w(struct wined3d_context *context, const struct wi
WARN
(
"Unsupported in local OpenGL implementation: glSampleMaski.
\n
"
);
}
static
void
state_positiondegree
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
if
(
state
->
render_states
[
WINED3D_RS_POSITIONDEGREE
]
!=
WINED3D_DEGREE_CUBIC
)
FIXME
(
"WINED3D_RS_POSITIONDEGREE %#x not yet implemented.
\n
"
,
state
->
render_states
[
WINED3D_RS_POSITIONDEGREE
]);
}
static
void
state_normaldegree
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
if
(
state
->
render_states
[
WINED3D_RS_NORMALDEGREE
]
!=
WINED3D_DEGREE_LINEAR
)
...
...
@@ -4603,7 +4596,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_POSITIONDEGREE
),
{
STATE_RENDER
(
WINED3D_RS_POSITIONDEGREE
),
state_positiondegree
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_NORMALDEGREE
),
{
STATE_RENDER
(
WINED3D_RS_NORMALDEGREE
),
state_normaldegree
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_MINTESSELLATIONLEVEL
),
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_MAXTESSELLATIONLEVEL
),
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5380,7 +5372,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
{
149
,
150
},
{
153
,
153
},
{
162
,
165
},
{
167
,
17
1
},
{
167
,
17
2
},
{
174
,
177
},
{
185
,
193
},
{
195
,
209
},
...
...
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