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
ff8f7874
Commit
ff8f7874
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_TWEENFACTOR stub to wined3d_device_apply_stateblock.
parent
be1ef8ed
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
device.c
dlls/wined3d/device.c
+3
-0
glsl_shader.c
dlls/wined3d/glsl_shader.c
+0
-1
shader_spirv.c
dlls/wined3d/shader_spirv.c
+0
-1
state.c
dlls/wined3d/state.c
+1
-3
No files found.
dlls/wined3d/device.c
View file @
ff8f7874
...
...
@@ -4207,6 +4207,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case
WINED3D_RS_INDEXEDVERTEXBLENDENABLE
:
break
;
case
WINED3D_RS_TWEENFACTOR
:
break
;
default:
wined3d_device_set_render_state
(
device
,
idx
,
state
->
rs
[
idx
]);
break
;
...
...
dlls/wined3d/glsl_shader.c
View file @
ff8f7874
...
...
@@ -11970,7 +11970,6 @@ static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] =
{
STATE_RENDER
(
WINED3D_RS_POINTSCALE_B
),
{
STATE_RENDER
(
WINED3D_RS_POINTSCALEENABLE
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_POINTSCALE_C
),
{
STATE_RENDER
(
WINED3D_RS_POINTSCALEENABLE
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MAX
),
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MIN
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_TWEENFACTOR
),
{
STATE_SHADER
(
WINED3D_SHADER_TYPE_VERTEX
),
NULL
},
WINED3D_GL_EXT_NONE
},
/* NP2 texture matrix fixups. They are not needed if
* GL_ARB_texture_non_power_of_two is supported. Otherwise, register
* glsl_vertex_pipe_texmatrix(), which takes care of updating the texture
...
...
dlls/wined3d/shader_spirv.c
View file @
ff8f7874
...
...
@@ -1145,7 +1145,6 @@ static const struct wined3d_state_entry_template spirv_vertex_pipe_vk_vp_states[
{
STATE_RENDER
(
WINED3D_RS_POINTSCALE_B
),
{
STATE_RENDER
(
WINED3D_RS_POINTSCALE_B
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_POINTSCALE_C
),
{
STATE_RENDER
(
WINED3D_RS_POINTSCALE_C
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MAX
),
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MAX
),
state_nop
}},
{
STATE_RENDER
(
WINED3D_RS_TWEENFACTOR
),
{
STATE_RENDER
(
WINED3D_RS_TWEENFACTOR
),
state_nop
}},
{
STATE_MATERIAL
,
{
STATE_MATERIAL
,
state_nop
}},
{
STATE_SHADER
(
WINED3D_SHADER_TYPE_VERTEX
),
{
STATE_SHADER
(
WINED3D_SHADER_TYPE_VERTEX
),
state_nop
}},
{
STATE_LIGHT_TYPE
,
{
STATE_LIGHT_TYPE
,
state_nop
}},
...
...
dlls/wined3d/state.c
View file @
ff8f7874
...
...
@@ -4986,7 +4986,6 @@ static const struct wined3d_state_entry_template vp_ffp_states[] =
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MAX
),
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MIN
),
NULL
},
ARB_POINT_PARAMETERS
},
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MAX
),
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MIN
),
NULL
},
EXT_POINT_PARAMETERS
},
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MAX
),
{
STATE_RENDER
(
WINED3D_RS_POINTSIZE_MIN
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3D_RS_TWEENFACTOR
),
{
STATE_RENDER
(
WINED3D_RS_VERTEXBLEND
),
NULL
},
WINED3D_GL_EXT_NONE
},
/* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported,
* so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states.
...
...
@@ -5381,8 +5380,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
{
149
,
150
},
{
153
,
153
},
{
162
,
165
},
{
167
,
169
},
{
171
,
171
},
{
167
,
171
},
{
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