wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
00451d5edf
commit
f3ee4d40ce
|
@ -613,7 +613,7 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex
|
||||||
else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D)
|
else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D)
|
||||||
{
|
{
|
||||||
wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture),
|
wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture),
|
||||||
&context_gl->c, ds_level, &render_targets[0]);
|
context_gl, ds_level, &render_targets[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1452,9 +1452,9 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture,
|
||||||
/* TODO: We should synchronize the renderbuffer's content with the texture's content. */
|
/* TODO: We should synchronize the renderbuffer's content with the texture's content. */
|
||||||
/* Context activation is done by the caller. */
|
/* Context activation is done by the caller. */
|
||||||
void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl,
|
void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl,
|
||||||
struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt)
|
struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt)
|
||||||
{
|
{
|
||||||
const struct wined3d_gl_info *gl_info = context->gl_info;
|
const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
|
||||||
struct wined3d_renderbuffer_entry *entry;
|
struct wined3d_renderbuffer_entry *entry;
|
||||||
unsigned int src_width, src_height;
|
unsigned int src_width, src_height;
|
||||||
unsigned int width, height;
|
unsigned int width, height;
|
||||||
|
|
|
@ -3626,7 +3626,7 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl,
|
||||||
void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl,
|
void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl,
|
||||||
struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN;
|
struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN;
|
||||||
void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl,
|
void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl,
|
||||||
struct wined3d_context *context, unsigned int level,
|
struct wined3d_context_gl *context_gl, unsigned int level,
|
||||||
const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN;
|
const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
#define WINED3D_LOCATION_DISCARDED 0x00000001
|
#define WINED3D_LOCATION_DISCARDED 0x00000001
|
||||||
|
|
Loading…
Reference in New Issue