ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Pass a wined3d_context_gl structure to wined3d_shader_resource_view_gl_bind(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-08-02 03:32:11 +04:30 committed by Alexandre Julliard
parent b848b2bcf3
commit aaf57e761a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/context.c
View File

@ -3809,7 +3809,7 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *
sampler = device->default_sampler;
else if (!(sampler = state->sampler[shader_type][entry->sampler_idx]))
sampler = device->null_sampler;
wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, &context_gl->c);
wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context_gl);
}
}

5
dlls/wined3d/view.c
View File

@ -828,10 +828,9 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc
}
void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl,
unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context)
unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl)
{
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_texture_gl *texture_gl;
wined3d_context_gl_active_texture(context_gl, gl_info, unit);

2
dlls/wined3d/wined3d_private.h
View File

@ -4137,7 +4137,7 @@ static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_vi
}
void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit,
struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN;
struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;
struct wined3d_unordered_access_view
{