From 77a1eefa3cef93d5988ee5c00f1b8c735c09b83f Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Tue, 23 May 2017 16:29:25 -0700 Subject: [PATCH] i965: Rename intel_create_renderbuffer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The name is misleading because the function is unrelated to GL renderbuffers. Rename it to intel_create_winsys_renderbuffer. Reviewed-by: Tapani Pälli --- src/mesa/drivers/dri/i965/intel_fbo.c | 11 ++++++----- src/mesa/drivers/dri/i965/intel_fbo.h | 2 +- src/mesa/drivers/dri/i965/intel_screen.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 60a6d0f4554..d3905a5f7fe 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -431,13 +431,14 @@ intel_nop_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *rb, } /** - * Create a new intel_renderbuffer which corresponds to an on-screen window, - * not a user-created renderbuffer. + * Create an intel_renderbuffer for a __DRIdrawable. This function is + * unrelated to GL renderbuffers (that is, those created by + * glGenRenderbuffers). * * \param num_samples must be quantized. */ struct intel_renderbuffer * -intel_create_renderbuffer(mesa_format format, unsigned num_samples) +intel_create_winsys_renderbuffer(mesa_format format, unsigned num_samples) { struct intel_renderbuffer *irb; struct gl_renderbuffer *rb; @@ -469,7 +470,7 @@ intel_create_renderbuffer(mesa_format format, unsigned num_samples) /** * Private window-system buffers (as opposed to ones shared with the display - * server created with intel_create_renderbuffer()) are most similar in their + * server created with intel_create_winsys_renderbuffer()) are most similar in their * handling to user-created renderbuffers, but they have a resize handler that * may be called at intel_update_renderbuffers() time. * @@ -480,7 +481,7 @@ intel_create_private_renderbuffer(mesa_format format, unsigned num_samples) { struct intel_renderbuffer *irb; - irb = intel_create_renderbuffer(format, num_samples); + irb = intel_create_winsys_renderbuffer(format, num_samples); irb->Base.Base.AllocStorage = intel_alloc_private_renderbuffer_storage; return irb; diff --git a/src/mesa/drivers/dri/i965/intel_fbo.h b/src/mesa/drivers/dri/i965/intel_fbo.h index 08b82e89348..2d2ef1ebc62 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.h +++ b/src/mesa/drivers/dri/i965/intel_fbo.h @@ -167,7 +167,7 @@ intel_rb_format(const struct intel_renderbuffer *rb) } extern struct intel_renderbuffer * -intel_create_renderbuffer(mesa_format format, unsigned num_samples); +intel_create_winsys_renderbuffer(mesa_format format, unsigned num_samples); struct intel_renderbuffer * intel_create_private_renderbuffer(mesa_format format, unsigned num_samples); diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 24123e79869..22f6d9af03c 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1200,11 +1200,11 @@ intelCreateBuffer(__DRIscreen *dri_screen, } /* setup the hardware-based renderbuffers */ - rb = intel_create_renderbuffer(rgbFormat, num_samples); + rb = intel_create_winsys_renderbuffer(rgbFormat, num_samples); _mesa_attach_and_own_rb(fb, BUFFER_FRONT_LEFT, &rb->Base.Base); if (mesaVis->doubleBufferMode) { - rb = intel_create_renderbuffer(rgbFormat, num_samples); + rb = intel_create_winsys_renderbuffer(rgbFormat, num_samples); _mesa_attach_and_own_rb(fb, BUFFER_BACK_LEFT, &rb->Base.Base); } -- 2.30.2