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
7c3941ce
Commit
7c3941ce
authored
Dec 12, 2022
by
Max Figura
Committed by
Alexandre Julliard
Mar 01, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move the WINED3D_RS_ANISOTROPY stub to wined3d_device_apply_stateblock.
parent
7ca0b7e3
Show 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 @
7c3941ce
...
@@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
...
@@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
{
STATE_INDEXBUFFER
,
{
STATE_INDEXBUFFER
,
state_nop
}},
{
STATE_INDEXBUFFER
,
{
STATE_INDEXBUFFER
,
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
{
STATE_RENDER
(
WINED3D_RS_LINEPATTERN
),
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_DITHERENABLE
),
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_ANISOTROPY
),
{
STATE_RENDER
(
WINED3D_RS_ANISOTROPY
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
state_nop
}},
...
...
dlls/wined3d/device.c
View file @
7c3941ce
...
@@ -4114,6 +4114,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
...
@@ -4114,6 +4114,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
FIXME
(
"Render state WINED3D_RS_MIPMAPLODBIAS not implemented yet.
\n
"
);
FIXME
(
"Render state WINED3D_RS_MIPMAPLODBIAS not implemented yet.
\n
"
);
break
;
break
;
case
WINED3D_RS_ANISOTROPY
:
if
(
state
->
rs
[
WINED3D_RS_ANISOTROPY
])
FIXME
(
"Render state WINED3D_RS_ANISOTROPY not implemented yet.
\n
"
);
break
;
default:
default:
wined3d_device_set_render_state
(
device
,
idx
,
state
->
rs
[
idx
]);
wined3d_device_set_render_state
(
device
,
idx
,
state
->
rs
[
idx
]);
break
;
break
;
...
...
dlls/wined3d/directx.c
View file @
7c3941ce
...
@@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
...
@@ -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_LINEPATTERN
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ZFUNC
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ZFUNC
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_ANISOTROPY
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
{
STATE_VDECL
}},
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
{
STATE_VDECL
}},
...
...
dlls/wined3d/state.c
View file @
7c3941ce
...
@@ -2042,12 +2042,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win
...
@@ -2042,12 +2042,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win
state
->
render_states
[
WINED3D_RS_ENABLEADAPTIVETESSELLATION
]);
state
->
render_states
[
WINED3D_RS_ENABLEADAPTIVETESSELLATION
]);
}
}
static
void
state_anisotropy
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
if
(
state
->
render_states
[
WINED3D_RS_ANISOTROPY
])
FIXME
(
"Render state WINED3D_RS_ANISOTROPY not implemented yet.
\n
"
);
}
static
void
state_flushbatch
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
static
void
state_flushbatch
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
{
if
(
state
->
render_states
[
WINED3D_RS_FLUSHBATCH
])
if
(
state
->
render_states
[
WINED3D_RS_FLUSHBATCH
])
...
@@ -4699,7 +4693,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
...
@@ -4699,7 +4693,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
},
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_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_DITHERENABLE
),
{
STATE_RENDER
(
WINED3D_RS_DITHERENABLE
),
state_ditherenable
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_ANISOTROPY
),
{
STATE_RENDER
(
WINED3D_RS_ANISOTROPY
),
state_anisotropy
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
state_flushbatch
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
{
STATE_RENDER
(
WINED3D_RS_FLUSHBATCH
),
state_flushbatch
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
state_translucentsi
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),{
STATE_RENDER
(
WINED3D_RS_TRANSLUCENTSORTINDEPENDENT
),
state_translucentsi
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
state_wrap
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
{
STATE_RENDER
(
WINED3D_RS_WRAP0
),
state_wrap
},
WINED3D_GL_EXT_NONE
},
...
@@ -5496,6 +5489,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
...
@@ -5496,6 +5489,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
{
30
,
33
},
{
30
,
33
},
{
39
,
40
},
{
39
,
40
},
{
42
,
47
},
{
42
,
47
},
{
49
,
49
},
{
52
,
59
},
{
52
,
59
},
{
61
,
127
},
{
61
,
127
},
{
149
,
150
},
{
149
,
150
},
...
...
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