From c3c7cbd15418293208034e8970d626b5998abd4b Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Sun, 13 Nov 2011 23:06:17 -0800 Subject: [PATCH] intel: Move inline functions from intel_fbo.h to .c Move the following inline functions: intel_get_rb_region intel_framebuffer_has_hiz A future commit will replace the renderbuffer's region with a miptree. This small refactor will eliminate the need for intel_fbo.h to include intel_mipmap_tree.h on that commit. I'd like to avoid the situation where each header transitively includes every other header. Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke Signed-off-by: Chad Versace --- src/mesa/drivers/dri/intel/intel_fbo.c | 19 +++++++++++++++++++ src/mesa/drivers/dri/intel/intel_fbo.h | 21 ++++----------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 16b49ae311d..429529c81c4 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -55,6 +55,25 @@ #define FILE_DEBUG_FLAG DEBUG_FBO +bool +intel_framebuffer_has_hiz(struct gl_framebuffer *fb) +{ + struct intel_renderbuffer *rb = NULL; + if (fb) + rb = intel_get_renderbuffer(fb, BUFFER_DEPTH); + return rb && rb->hiz_region; +} + +struct intel_region* +intel_get_rb_region(struct gl_framebuffer *fb, GLuint attIndex) +{ + struct intel_renderbuffer *irb = intel_get_renderbuffer(fb, attIndex); + if (irb) + return irb->region; + else + return NULL; +} + /** * Create a new framebuffer object. */ diff --git a/src/mesa/drivers/dri/intel/intel_fbo.h b/src/mesa/drivers/dri/intel/intel_fbo.h index b46700a2509..63da6659296 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.h +++ b/src/mesa/drivers/dri/intel/intel_fbo.h @@ -134,14 +134,8 @@ intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex) return irb; } -static inline bool -intel_framebuffer_has_hiz(struct gl_framebuffer *fb) -{ - struct intel_renderbuffer *rb = NULL; - if (fb) - rb = intel_get_renderbuffer(fb, BUFFER_DEPTH); - return rb && rb->hiz_region; -} +bool +intel_framebuffer_has_hiz(struct gl_framebuffer *fb); extern struct intel_renderbuffer * intel_create_renderbuffer(gl_format format); @@ -174,14 +168,7 @@ intel_renderbuffer_tile_offsets(struct intel_renderbuffer *irb, uint32_t *tile_x, uint32_t *tile_y); -static INLINE struct intel_region * -intel_get_rb_region(struct gl_framebuffer *fb, GLuint attIndex) -{ - struct intel_renderbuffer *irb = intel_get_renderbuffer(fb, attIndex); - if (irb) - return irb->region; - else - return NULL; -} +struct intel_region* +intel_get_rb_region(struct gl_framebuffer *fb, GLuint attIndex); #endif /* INTEL_FBO_H */ -- 2.30.2