Skip to content

W
wine-winehq
Commit 4c93750e authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard
Browse files
Options

wined3d: Don't setup FBO and draw buffers in wined3d_context_gl_apply_blit_state().

All the callers (i.e. the blitters) also call context_gl_apply_texture_draw_state() that does that part of the setup anyway.
parent 9448c716
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 64 deletions
dlls/wined3d/arb_program_shader.c
View file @ 4c93750e
......@@ -7912,6 +7912,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl
else
wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location);
context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location);
wined3d_context_gl_apply_ffp_blit_state(context_gl, device);
if (dst_location == WINED3D_LOCATION_DRAWABLE)
......@@ -7921,8 +7922,6 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl
dst_rect = &d;
}
context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location);
if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST)
{
const struct wined3d_format *fmt = src_texture->resource.format;
......
dlls/wined3d/context_gl.c
View file @ 4c93750e
......@@ -3238,50 +3238,12 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl,
{
struct wined3d_context *context = &context_gl->c;
const struct wined3d_gl_info *gl_info;
uint32_t rt_mask, *cur_mask;
struct wined3d_texture *rt;
unsigned int sampler;
SIZE rt_size;
TRACE("Setting up context %p for blitting.\n", context);
gl_info = context_gl->gl_info;
rt = context->current_rt.texture;
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
{
if (context->render_offscreen)
{
wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &rt->resource,
context->current_rt.sub_resource_idx, NULL, 0, rt->resource.draw_binding);
if (rt->resource.format->id != WINED3DFMT_NULL)
rt_mask = 1;
else
rt_mask = 0;
}
else
{
context_gl->current_fbo = NULL;
wined3d_context_gl_bind_fbo(context_gl, GL_DRAW_FRAMEBUFFER, 0);
rt_mask = context_generate_rt_mask_from_resource(&rt->resource);
}
}
else
{
rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, &rt->resource);
}
cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask;
if (rt_mask != *cur_mask)
{
wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask);
*cur_mask = rt_mask;
}
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER);
context_invalidate_state(context, STATE_FRAMEBUFFER);
wined3d_context_gl_get_rt_size(context_gl, &rt_size);
......@@ -3640,38 +3602,52 @@ void context_gl_apply_texture_draw_state(struct wined3d_context_gl *context_gl,
struct wined3d_texture *texture, unsigned int sub_resource_idx, unsigned int location)
{
const struct wined3d_format *format = texture->resource.format;
GLenum buffer;
struct wined3d_context *context = &context_gl->c;
uint32_t rt_mask, *cur_mask;
if (wined3d_settings.offscreen_rendering_mode != ORM_FBO)
return;
TRACE("context_gl %p, texture %p, sub_resource_idx %u, location %s.\n",
context_gl, texture, sub_resource_idx, wined3d_debug_location(location));
if (format->depth_size || format->stencil_size)
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
{
wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER,
NULL, 0, &texture->resource, sub_resource_idx, location);
buffer = GL_NONE;
if (format->depth_size || format->stencil_size)
wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, NULL,
0, &texture->resource, sub_resource_idx, location);
else
wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &texture->resource,
sub_resource_idx, NULL, 0, location);
}
else
{
wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER,
&texture->resource, sub_resource_idx, NULL, 0, location);
if (location == WINED3D_LOCATION_DRAWABLE)
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
{
if (location != WINED3D_LOCATION_DRAWABLE)
{
TRACE("Texture %p is onscreen.\n", texture);
buffer = wined3d_texture_get_gl_buffer(texture);
if (texture->resource.format->id == WINED3DFMT_NULL || format->depth_size || format->stencil_size)
rt_mask = 0;
else
rt_mask = 1;
}
else
{
TRACE("Texture %p is offscreen.\n", texture);
buffer = GL_COLOR_ATTACHMENT0;
rt_mask = context_generate_rt_mask_from_resource(&texture->resource);
}
}
else
{
rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, &texture->resource);
}
wined3d_context_gl_set_draw_buffer(context_gl, buffer);
wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER);
context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER);
cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask;
if (rt_mask != *cur_mask)
{
wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask);
*cur_mask = rt_mask;
}
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER);
context_invalidate_state(context, STATE_FRAMEBUFFER);
}
/* Context activation is done by the caller. */
......
dlls/wined3d/glsl_shader.c
View file @ 4c93750e
......@@ -13217,6 +13217,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
else
wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location);
context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location);
wined3d_context_gl_apply_blit_state(context_gl, device);
if (dst_location == WINED3D_LOCATION_DRAWABLE)
......@@ -13226,8 +13227,6 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
dst_rect = &d;
}
context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location);
if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST)
{
const struct wined3d_format *f = src_texture->resource.format;
......
dlls/wined3d/texture.c
View file @ 4c93750e
......@@ -6286,6 +6286,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
else
wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location);
context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location);
wined3d_context_gl_apply_ffp_blit_state(context_gl, device);
if (dst_location == WINED3D_LOCATION_DRAWABLE)
......@@ -6295,8 +6296,6 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
dst_rect = &r;
}
context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location);
gl_info->gl_ops.gl.p_glEnable(src_texture_gl->target);
checkGLcall("glEnable(target)");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment