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
79ea470d
Commit
79ea470d
authored
Dec 13, 2022
by
Max Figura
Committed by
Alexandre Julliard
Mar 16, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move the WINED3D_RS_DEBUGMONITORTOKEN stub to wined3d_device_apply_stateblock.
parent
5c61a9c3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
9 deletions
+5
-9
adapter_vk.c
dlls/wined3d/adapter_vk.c
+0
-1
device.c
dlls/wined3d/device.c
+4
-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 @
79ea470d
...
...
@@ -108,7 +108,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
{
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
}},
{
STATE_RENDER
(
WINED3D_RS_DEBUGMONITORTOKEN
),
{
STATE_RENDER
(
WINED3D_RS_DEBUGMONITORTOKEN
),
state_nop
}},
/* Samplers */
{
STATE_SAMPLER
(
0
),
{
STATE_SAMPLER
(
0
),
state_nop
}},
{
STATE_SAMPLER
(
1
),
{
STATE_SAMPLER
(
1
),
state_nop
}},
...
...
dlls/wined3d/device.c
View file @
79ea470d
...
...
@@ -4200,6 +4200,10 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
break
;
}
case
WINED3D_RS_DEBUGMONITORTOKEN
:
WARN
(
"token: %#x.
\n
"
,
state
->
rs
[
WINED3D_RS_DEBUGMONITORTOKEN
]);
break
;
default:
wined3d_device_set_render_state
(
device
,
idx
,
state
->
rs
[
idx
]);
break
;
...
...
dlls/wined3d/directx.c
View file @
79ea470d
...
...
@@ -2821,7 +2821,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
{
STATE_RENDER
(
WINED3D_RS_ADAPTIVETESS_W
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ENABLEADAPTIVETESSELLATION
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_MULTISAMPLEANTIALIAS
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_DEBUGMONITORTOKEN
),
{
STATE_VDECL
}},
/* Samplers */
{
STATE_SAMPLER
(
0
),
{
STATE_VDECL
}},
{
STATE_SAMPLER
(
1
),
{
STATE_VDECL
}},
...
...
dlls/wined3d/state.c
View file @
79ea470d
...
...
@@ -1766,11 +1766,6 @@ static void state_pscale(struct wined3d_context *context, const struct wined3d_s
checkGLcall
(
"glPointSize(...);"
);
}
static
void
state_debug_monitor
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
WARN
(
"token: %#x.
\n
"
,
state
->
render_states
[
WINED3D_RS_DEBUGMONITORTOKEN
]);
}
static
void
state_localviewer
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
const
struct
wined3d_gl_info
*
gl_info
=
wined3d_context_gl
(
context
)
->
gl_info
;
...
...
@@ -4619,7 +4614,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
{
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
},
{
STATE_RENDER
(
WINED3D_RS_DEBUGMONITORTOKEN
),
{
STATE_RENDER
(
WINED3D_RS_DEBUGMONITORTOKEN
),
state_debug_monitor
},
WINED3D_GL_EXT_NONE
},
/* Samplers */
{
STATE_SAMPLER
(
0
),
{
STATE_SAMPLER
(
0
),
sampler
},
WINED3D_GL_EXT_NONE
},
{
STATE_SAMPLER
(
1
),
{
STATE_SAMPLER
(
1
),
sampler
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5387,7 +5381,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
{
144
,
144
},
{
149
,
150
},
{
153
,
153
},
{
162
,
16
4
},
{
162
,
16
5
},
{
168
,
169
},
{
171
,
171
},
{
174
,
177
},
...
...
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