summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2015-11-12 09:29:34 -0800
committerIan Romanick <[email protected]>2016-02-10 10:59:53 -0800
commit3aeff21fbfb33197538a30871dc054064dc0ff33 (patch)
treef1242da15eff3d9a20db71dd90e8665fbef809d4 /src/mesa/drivers
parent4087c17832b737951280c7bf1977b589a88ec4cb (diff)
meta: Use internal functions for renderbuffer access
Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/common/meta.c10
-rw-r--r--src/mesa/drivers/common/meta_copy_image.c12
2 files changed, 8 insertions, 14 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 217d376281f..9fc7bc6a6b6 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3074,10 +3074,8 @@ decompress_texture_image(struct gl_context *ctx,
_mesa_GenFramebuffers(1, &decompress_fbo->FBO);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress_fbo->FBO);
- _mesa_FramebufferRenderbuffer(GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT,
- GL_RENDERBUFFER_EXT,
- decompress_fbo->rb->Name);
+ _mesa_framebuffer_renderbuffer(ctx, ctx->DrawBuffer, GL_COLOR_ATTACHMENT0,
+ decompress_fbo->rb);
}
else {
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress_fbo->FBO);
@@ -3085,8 +3083,8 @@ decompress_texture_image(struct gl_context *ctx,
/* alloc dest surface */
if (width > decompress_fbo->Width || height > decompress_fbo->Height) {
- _mesa_NamedRenderbufferStorage(decompress_fbo->rb->Name, rbFormat,
- width, height);
+ _mesa_renderbuffer_storage(ctx, decompress_fbo->rb, rbFormat,
+ width, height, 0);
status = _mesa_CheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE) {
/* If the framebuffer isn't complete then we'll leave
diff --git a/src/mesa/drivers/common/meta_copy_image.c b/src/mesa/drivers/common/meta_copy_image.c
index 2c2b7ba6bf8..6534d432e61 100644
--- a/src/mesa/drivers/common/meta_copy_image.c
+++ b/src/mesa/drivers/common/meta_copy_image.c
@@ -241,10 +241,8 @@ _mesa_meta_CopyImageSubData_uncompressed(struct gl_context *ctx,
_mesa_meta_bind_fbo_image(GL_READ_FRAMEBUFFER, attachment,
src_view_tex_image, src_z);
} else {
- _mesa_FramebufferRenderbuffer(GL_READ_FRAMEBUFFER,
- attachment,
- GL_RENDERBUFFER,
- src_renderbuffer->Name);
+ _mesa_framebuffer_renderbuffer(ctx, ctx->ReadBuffer, attachment,
+ src_renderbuffer);
}
status = _mesa_CheckFramebufferStatus(GL_READ_FRAMEBUFFER);
@@ -252,10 +250,8 @@ _mesa_meta_CopyImageSubData_uncompressed(struct gl_context *ctx,
goto meta_end;
if (dst_renderbuffer) {
- _mesa_FramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER,
- attachment,
- GL_RENDERBUFFER,
- dst_renderbuffer->Name);
+ _mesa_framebuffer_renderbuffer(ctx, ctx->DrawBuffer, attachment,
+ dst_renderbuffer);
} else {
_mesa_meta_bind_fbo_image(GL_DRAW_FRAMEBUFFER, attachment,
dst_tex_image, dst_z);