From 1839a7fc9faae81d32ffc0cdc908b933f4524e28 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 16 Jan 2012 13:05:44 -0700 Subject: [PATCH] intel: remove intel_span_supports_format() It always returned True. --- src/mesa/drivers/dri/intel/intel_fbo.c | 8 -------- src/mesa/drivers/dri/intel/intel_span.c | 12 ------------ src/mesa/drivers/dri/intel/intel_span.h | 1 - 3 files changed, 21 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 0bb61b5d642..3a35a01abca 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -833,14 +833,6 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb) _mesa_get_format_name(intel_rb_format(irb))); fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT; } - -#ifdef I915 - if (!intel_span_supports_format(intel_rb_format(irb))) { - DBG("Unsupported swrast texture/renderbuffer format attached: %s\n", - _mesa_get_format_name(intel_rb_format(irb))); - fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT; - } -#endif } } diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c index 9b6540d488f..2090e51d40c 100644 --- a/src/mesa/drivers/dri/intel/intel_span.c +++ b/src/mesa/drivers/dri/intel/intel_span.c @@ -332,15 +332,3 @@ intel_unmap_vertex_shader_textures(struct gl_context *ctx) } } } - - -bool -intel_span_supports_format(gl_format format) -{ - /* Rendering to/from integer textures will be done using MapRenderbuffer, - * rather than coding up new paths through GetRow/PutRow(), so claim support - * for those formats in here for now. - */ - return true; -} - diff --git a/src/mesa/drivers/dri/intel/intel_span.h b/src/mesa/drivers/dri/intel/intel_span.h index 6640e15fcde..b2bd416412f 100644 --- a/src/mesa/drivers/dri/intel/intel_span.h +++ b/src/mesa/drivers/dri/intel/intel_span.h @@ -38,7 +38,6 @@ extern void intelSpanRenderStart(struct gl_context * ctx); void intel_map_vertex_shader_textures(struct gl_context *ctx); void intel_unmap_vertex_shader_textures(struct gl_context *ctx); -bool intel_span_supports_format(gl_format format); intptr_t intel_offset_S8(uint32_t stride, uint32_t x, uint32_t y); #endif -- 2.30.2