diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2015-11-13 17:35:30 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2016-03-01 11:07:20 -0800 |
| commit | 8f1b1878a0ae80dddc95a4322b0e84f486015c81 (patch) | |
| tree | a8553011c9e049d65c5815ee9843152717bb5200 /src/mesa/drivers/dri/i965/brw_meta_updownsample.c | |
| parent | 3071da303211701df38ee052cb80c30acba51768 (diff) | |
| download | external_mesa3d-8f1b1878a0ae80dddc95a4322b0e84f486015c81.zip external_mesa3d-8f1b1878a0ae80dddc95a4322b0e84f486015c81.tar.gz external_mesa3d-8f1b1878a0ae80dddc95a4322b0e84f486015c81.tar.bz2 | |
i965/meta: Use _mesa_bind_framebuffers instead of _mesa_BindFramebuffer
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_meta_updownsample.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_meta_updownsample.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c index 213de2a..da06fef 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c +++ b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c @@ -93,7 +93,9 @@ brw_meta_updownsample(struct brw_context *brw, struct intel_mipmap_tree *dst_mt) { struct gl_context *ctx = &brw->ctx; - GLuint fbos[2], src_fbo, dst_fbo; + GLuint fbos[2]; + struct gl_framebuffer *src_fb; + struct gl_framebuffer *dst_fb; struct gl_renderbuffer *src_rb; struct gl_renderbuffer *dst_rb; GLenum drawbuffer; @@ -116,14 +118,16 @@ brw_meta_updownsample(struct brw_context *brw, _mesa_CreateFramebuffers(2, fbos); src_rb = brw_get_rb_for_slice(brw, src_mt, 0, 0, false); dst_rb = brw_get_rb_for_slice(brw, dst_mt, 0, 0, false); - src_fbo = fbos[0]; - dst_fbo = fbos[1]; + src_fb = _mesa_lookup_framebuffer(ctx, fbos[0]); + dst_fb = _mesa_lookup_framebuffer(ctx, fbos[1]); - _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, src_fbo); + assert(src_fb != NULL && src_fb->Name == fbos[0]); + assert(dst_fb != NULL && dst_fb->Name == fbos[1]); + + _mesa_bind_framebuffers(ctx, dst_fb, src_fb); _mesa_framebuffer_renderbuffer(ctx, ctx->ReadBuffer, attachment, src_rb); _mesa_ReadBuffer(drawbuffer); - _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER, dst_fbo); _mesa_framebuffer_renderbuffer(ctx, ctx->DrawBuffer, attachment, dst_rb); _mesa_DrawBuffer(drawbuffer); |