summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2012-07-11 14:52:53 -0700
committerChad Versace <[email protected]>2012-08-07 09:30:33 -0700
commit53fa28f7b1f21251a3807abf1f234f52beff0256 (patch)
treeb5ae431b1c53d1fab5c369d8b6578cdbfedc0f51
parent7a2e40ed283b70e1da8ea762959ca7462b0f2fc3 (diff)
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 <[email protected]> Reviewed-by: Paul Berry <[email protected]> (v1) Signed-off-by: Chad Versace <[email protected]>
-rw-r--r--src/mesa/drivers/dri/intel/intel_fbo.c7
-rw-r--r--src/mesa/drivers/dri/intel/intel_fbo.h3
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