From 53fa28f7b1f21251a3807abf1f234f52beff0256 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 11 Jul 2012 14:52:53 -0700 Subject: [PATCH] intel: Refactor quantize_num_samples Rename quantize_num_samples to intel_quantize_num_samples and change the first param from struct intel_context* to struct intel_screen*. The function will later be used by intelCreateBuffer, which is not bound to any context but is bound to a screen. Reviewed-by: Eric Anholt Reviewed-by: Paul Berry (v1) Signed-off-by: Chad Versace --- src/mesa/drivers/dri/intel/intel_fbo.c | 7 ++++--- src/mesa/drivers/dri/intel/intel_fbo.h | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 613287f6d3d..80af192d3ef 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -182,8 +182,8 @@ intel_unmap_renderbuffer(struct gl_context *ctx, /** * Round up the requested multisample count to the next supported sample size. */ -static unsigned -quantize_num_samples(struct intel_context *intel, unsigned num_samples) +unsigned +intel_quantize_num_samples(struct intel_screen *intel, unsigned num_samples) { switch (intel->gen) { case 6: @@ -226,8 +226,9 @@ intel_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffer GLuint width, GLuint height) { struct intel_context *intel = intel_context(ctx); + struct intel_screen *screen = intel->intelScreen; struct intel_renderbuffer *irb = intel_renderbuffer(rb); - rb->NumSamples = quantize_num_samples(intel, rb->NumSamples); + rb->NumSamples = intel_quantize_num_samples(screen, rb->NumSamples); switch (internalFormat) { default: diff --git a/src/mesa/drivers/dri/intel/intel_fbo.h b/src/mesa/drivers/dri/intel/intel_fbo.h index 02bda1efc8b..b922dca8403 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.h +++ b/src/mesa/drivers/dri/intel/intel_fbo.h @@ -200,6 +200,9 @@ bool intel_renderbuffer_resolve_depth(struct intel_context *intel, struct intel_renderbuffer *irb); +unsigned +intel_quantize_num_samples(struct intel_screen *intel, unsigned num_samples); + #ifdef __cplusplus } #endif -- 2.30.2