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
0dfc9461
Commit
0dfc9461
authored
Dec 12, 2022
by
Max Figura
Committed by
Alexandre Julliard
Feb 14, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move the WINED3D_RS_MONOENABLE stub to wined3d_device_apply_stateblock.
parent
089ef6f3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
9 deletions
+6
-9
adapter_vk.c
dlls/wined3d/adapter_vk.c
+0
-1
device.c
dlls/wined3d/device.c
+5
-0
directx.c
dlls/wined3d/directx.c
+0
-1
state.c
dlls/wined3d/state.c
+1
-7
No files found.
dlls/wined3d/adapter_vk.c
View file @
0dfc9461
...
...
@@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
{
STATE_VIEWPORT
,
{
STATE_VIEWPORT
,
state_nop
}},
{
STATE_INDEXBUFFER
,
{
STATE_INDEXBUFFER
,
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_MONOENABLE
),
{
STATE_RENDER
(
WINED3D_RS_MONOENABLE
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_ROP2
),
{
STATE_RENDER
(
WINED3D_RS_ROP2
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_PLANEMASK
),
{
STATE_RENDER
(
WINED3D_RS_PLANEMASK
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_LASTPIXEL
),
{
STATE_RENDER
(
WINED3D_RS_LASTPIXEL
),
state_nop
}},
...
...
dlls/wined3d/device.c
View file @
0dfc9461
...
...
@@ -4057,6 +4057,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
FIXME
(
"Render state WINED3D_RS_WRAPV not implemented yet.
\n
"
);
break
;
case
WINED3D_RS_MONOENABLE
:
if
(
state
->
rs
[
WINED3D_RS_MONOENABLE
])
FIXME
(
"Render state WINED3D_RS_MONOENABLE not implemented yet.
\n
"
);
break
;
default:
wined3d_device_set_render_state
(
device
,
idx
,
state
->
rs
[
idx
]);
break
;
...
...
dlls/wined3d/directx.c
View file @
0dfc9461
...
...
@@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
{
STATE_VIEWPORT
,
{
STATE_VDECL
}},
{
STATE_INDEXBUFFER
,
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_MONOENABLE
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ROP2
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_PLANEMASK
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_LASTPIXEL
),
{
STATE_VDECL
}},
...
...
dlls/wined3d/state.c
View file @
0dfc9461
...
...
@@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win
state
->
render_states
[
WINED3D_RS_ENABLEADAPTIVETESSELLATION
]);
}
static
void
state_monoenable
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
if
(
state
->
render_states
[
WINED3D_RS_MONOENABLE
])
FIXME
(
"Render state WINED3D_RS_MONOENABLE not implemented yet.
\n
"
);
}
static
void
state_rop2
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
if
(
state
->
render_states
[
WINED3D_RS_ROP2
])
...
...
@@ -4770,7 +4764,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
{
STATE_INDEXBUFFER
,
{
STATE_INDEXBUFFER
,
state_nop
},
WINED3D_GL_EXT_NONE
},
{
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_MONOENABLE
),
{
STATE_RENDER
(
WINED3D_RS_MONOENABLE
),
state_monoenable
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_ROP2
),
{
STATE_RENDER
(
WINED3D_RS_ROP2
),
state_rop2
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_PLANEMASK
),
{
STATE_RENDER
(
WINED3D_RS_PLANEMASK
),
state_planemask
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_LASTPIXEL
),
{
STATE_RENDER
(
WINED3D_RS_LASTPIXEL
),
state_lastpixel
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5572,6 +5565,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
rs_holes
[]
=
{
{
1
,
8
},
{
11
,
11
},
{
14
,
14
},
{
17
,
23
},
{
27
,
27
},
...
...
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