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
17b9c453
Commit
17b9c453
authored
Jan 05, 2023
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 16, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods.
parent
dfb1665b
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
13 deletions
+12
-13
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
ati_fragment_shader.c
dlls/wined3d/ati_fragment_shader.c
+1
-1
ffp_gl.c
dlls/wined3d/ffp_gl.c
+2
-2
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-3
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+2
-2
shader_spirv.c
dlls/wined3d/shader_spirv.c
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+2
-2
No files found.
dlls/wined3d/arb_program_shader.c
View file @
17b9c453
...
...
@@ -5740,7 +5740,7 @@ struct arbfp_ffp_desc
};
/* Context activation is done by the caller. */
static
void
arbfp_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
static
void
arbfp_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{
const
struct
wined3d_gl_info
*
gl_info
=
wined3d_context_gl_const
(
context
)
->
gl_info
;
...
...
dlls/wined3d/ati_fragment_shader.c
View file @
17b9c453
...
...
@@ -1251,7 +1251,7 @@ static const struct wined3d_state_entry_template atifs_fragmentstate_template[]
};
/* Context activation is done by the caller. */
static
void
atifs_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
static
void
atifs_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{
const
struct
wined3d_gl_info
*
gl_info
=
wined3d_context_gl_const
(
context
)
->
gl_info
;
...
...
dlls/wined3d/ffp_gl.c
View file @
17b9c453
...
...
@@ -4840,7 +4840,7 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] =
};
/* Context activation is done by the caller. */
static
void
ffp_pipe_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{}
static
void
ffp_pipe_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{}
static
void
ffp_pipe_disable
(
const
struct
wined3d_context
*
context
)
{}
...
...
@@ -4967,7 +4967,7 @@ const struct wined3d_fragment_pipe_ops ffp_fragment_pipeline =
.
states
=
ffp_fragmentstate_template
,
};
static
void
none_pipe_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{}
static
void
none_pipe_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{}
static
void
none_pipe_disable
(
const
struct
wined3d_context
*
context
)
{}
...
...
dlls/wined3d/glsl_shader.c
View file @
17b9c453
...
...
@@ -11563,7 +11563,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend =
shader_glsl_shader_compile
,
};
static
void
glsl_vertex_pipe_vp_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{}
static
void
glsl_vertex_pipe_vp_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{}
static
void
glsl_vertex_pipe_vp_disable
(
const
struct
wined3d_context
*
context
)
{}
...
...
@@ -12060,8 +12060,7 @@ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe =
.
vp_states
=
glsl_vertex_pipe_vp_states
,
};
static
void
glsl_fragment_pipe_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
static
void
glsl_fragment_pipe_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{
/* Nothing to do. */
}
...
...
dlls/wined3d/nvidia_texture_shader.c
View file @
17b9c453
...
...
@@ -660,7 +660,7 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d
}
/* Context activation is done by the caller. */
static
void
nvrc_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
static
void
nvrc_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{
const
struct
wined3d_gl_info
*
gl_info
=
wined3d_context_gl_const
(
context
)
->
gl_info
;
...
...
@@ -685,7 +685,7 @@ static void nvrc_disable(const struct wined3d_context *context)
}
/* Context activation is done by the caller. */
static
void
nvts_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
static
void
nvts_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{
const
struct
wined3d_gl_info
*
gl_info
=
wined3d_context_gl_const
(
context
)
->
gl_info
;
...
...
dlls/wined3d/shader_spirv.c
View file @
17b9c453
...
...
@@ -1136,7 +1136,7 @@ const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(vo
return
&
spirv_shader_backend_vk
;
}
static
void
spirv_vertex_pipe_vk_vp_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
static
void
spirv_vertex_pipe_vk_vp_apply_draw_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{
/* Nothing to do. */
}
...
...
@@ -1219,7 +1219,7 @@ const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void)
}
static
void
spirv_fragment_pipe_vk_fp_apply_draw_state
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
)
{
/* Nothing to do. */
}
...
...
dlls/wined3d/wined3d_private.h
View file @
17b9c453
...
...
@@ -2001,7 +2001,7 @@ struct wined3d_state_entry_template
struct
wined3d_fragment_pipe_ops
{
void
(
*
fp_apply_draw_state
)(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
);
void
(
*
fp_apply_draw_state
)(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
);
void
(
*
fp_disable
)(
const
struct
wined3d_context
*
context
);
void
(
*
get_caps
)(
const
struct
wined3d_adapter
*
adapter
,
struct
fragment_caps
*
caps
);
unsigned
int
(
*
get_emul_mask
)(
const
struct
wined3d_adapter
*
adapter
);
...
...
@@ -2029,7 +2029,7 @@ struct wined3d_vertex_caps
struct
wined3d_vertex_pipe_ops
{
void
(
*
vp_apply_draw_state
)(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
);
void
(
*
vp_apply_draw_state
)(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
);
void
(
*
vp_disable
)(
const
struct
wined3d_context
*
context
);
void
(
*
vp_get_caps
)(
const
struct
wined3d_adapter
*
adapter
,
struct
wined3d_vertex_caps
*
caps
);
unsigned
int
(
*
vp_get_emul_mask
)(
const
struct
wined3d_adapter
*
adapter
);
...
...
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