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
a64271c0
Commit
a64271c0
authored
Nov 06, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 07, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Make the surface parameter to blit_shader.set_shader() const.
parent
12268879
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
surface.c
dlls/wined3d/surface.c
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
a64271c0
...
...
@@ -7121,7 +7121,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_
}
/* Context activation is done by the caller. */
static
HRESULT
arbfp_blit_set
(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
struct
wined3d_surface
*
surface
)
static
HRESULT
arbfp_blit_set
(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surface
)
{
GLenum
shader
;
float
size
[
4
]
=
{(
float
)
surface
->
pow2Width
,
(
float
)
surface
->
pow2Height
,
1
.
0
f
,
1
.
0
f
};
...
...
dlls/wined3d/surface.c
View file @
a64271c0
...
...
@@ -6260,7 +6260,7 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co
}
/* Context activation is done by the caller. */
static
HRESULT
ffp_blit_set
(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
struct
wined3d_surface
*
surface
)
static
HRESULT
ffp_blit_set
(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surface
)
{
enum
complex_fixup
fixup
=
get_complex_fixup
(
surface
->
resource
.
format
->
color_fixup
);
...
...
@@ -6409,7 +6409,7 @@ static void cpu_blit_free(struct wined3d_device *device)
}
/* Context activation is done by the caller. */
static
HRESULT
cpu_blit_set
(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
struct
wined3d_surface
*
surface
)
static
HRESULT
cpu_blit_set
(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surface
)
{
return
WINED3D_OK
;
}
...
...
dlls/wined3d/wined3d_private.h
View file @
a64271c0
...
...
@@ -1201,7 +1201,7 @@ struct blit_shader
{
HRESULT
(
*
alloc_private
)(
struct
wined3d_device
*
device
);
void
(
*
free_private
)(
struct
wined3d_device
*
device
);
HRESULT
(
*
set_shader
)(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
struct
wined3d_surface
*
surface
);
HRESULT
(
*
set_shader
)(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surface
);
void
(
*
unset_shader
)(
const
struct
wined3d_gl_info
*
gl_info
);
BOOL
(
*
blit_supported
)(
const
struct
wined3d_gl_info
*
gl_info
,
enum
wined3d_blit_op
blit_op
,
const
RECT
*
src_rect
,
DWORD
src_usage
,
WINED3DPOOL
src_pool
,
const
struct
wined3d_format
*
src_format
,
...
...
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