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
a668fa89
Commit
a668fa89
authored
Jun 20, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to context_draw_shaded_quad().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
292a1588
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
context.c
dlls/wined3d/context.c
+2
-3
glsl_shader.c
dlls/wined3d/glsl_shader.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+3
-3
No files found.
dlls/wined3d/context.c
View file @
a668fa89
...
...
@@ -5584,12 +5584,11 @@ static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, stru
}
/* Context activation is done by the caller. */
void
context_draw_shaded_quad
(
struct
wined3d_context
*
context
,
struct
wined3d_texture_gl
*
texture_gl
,
void
wined3d_context_gl_draw_shaded_quad
(
struct
wined3d_context_gl
*
context_gl
,
struct
wined3d_texture_gl
*
texture_gl
,
unsigned
int
sub_resource_idx
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
enum
wined3d_texture_filter_type
filter
)
{
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl
(
context
);
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context_gl
->
c
.
gl_info
;
struct
wined3d_blt_info
info
;
unsigned
int
level
,
w
,
h
,
i
;
SIZE
dst_size
;
...
...
dlls/wined3d/glsl_shader.c
View file @
a668fa89
...
...
@@ -13085,7 +13085,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
location
=
GL_EXTCALL
(
glGetUniformLocation
(
program
->
id
,
"colour_key.high"
));
GL_EXTCALL
(
glUniform4fv
(
location
,
1
,
&
float_key
[
1
].
r
));
}
context_draw_shaded_quad
(
context
,
src_texture_gl
,
src_sub_resource_idx
,
src_rect
,
dst_rect
,
filter
);
wined3d_context_gl_draw_shaded_quad
(
context_gl
,
src_texture_gl
,
src_sub_resource_idx
,
src_rect
,
dst_rect
,
filter
);
GL_EXTCALL
(
glUseProgram
(
0
));
if
(
dst_texture
->
swapchain
&&
(
dst_texture
->
swapchain
->
front_buffer
==
dst_texture
))
...
...
dlls/wined3d/wined3d_private.h
View file @
a668fa89
...
...
@@ -2090,6 +2090,9 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl,
const
struct
wined3d_bo_address
*
dst
,
GLenum
dst_binding
,
const
struct
wined3d_bo_address
*
src
,
GLenum
src_binding
,
size_t
size
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_destroy
(
struct
wined3d_context_gl
*
context_gl
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_draw_shaded_quad
(
struct
wined3d_context_gl
*
context_gl
,
struct
wined3d_texture_gl
*
texture_gl
,
unsigned
int
sub_resource_idx
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
enum
wined3d_texture_filter_type
filter
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_enable_clip_distances
(
struct
wined3d_context_gl
*
context_gl
,
uint32_t
mask
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_end_transform_feedback
(
struct
wined3d_context_gl
*
context_gl
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_free_fence
(
struct
wined3d_fence
*
fence
)
DECLSPEC_HIDDEN
;
...
...
@@ -2254,9 +2257,6 @@ BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl
BOOL
wined3d_clip_blit
(
const
RECT
*
clip_rect
,
RECT
*
clipped
,
RECT
*
other
)
DECLSPEC_HIDDEN
;
HGLRC
context_create_wgl_attribs
(
const
struct
wined3d_gl_info
*
gl_info
,
HDC
hdc
,
HGLRC
share_ctx
)
DECLSPEC_HIDDEN
;
void
context_draw_shaded_quad
(
struct
wined3d_context
*
context
,
struct
wined3d_texture_gl
*
texture_gl
,
unsigned
int
sub_resource_idx
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
enum
wined3d_texture_filter_type
filter
)
DECLSPEC_HIDDEN
;
void
context_draw_textured_quad
(
struct
wined3d_context
*
context
,
struct
wined3d_texture_gl
*
texture_gl
,
unsigned
int
sub_resource_idx
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
enum
wined3d_texture_filter_type
filter
)
DECLSPEC_HIDDEN
;
...
...
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