OSDN Git Service

intel: remove intel_span_supports_format()
authorBrian Paul <brianp@vmware.com>
Mon, 16 Jan 2012 20:05:44 +0000 (13:05 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Sat, 28 Jan 2012 02:02:41 +0000 (18:02 -0800)
It always returned True.
(cherry picked from commit 1839a7fc9faae81d32ffc0cdc908b933f4524e28)

src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_span.c
src/mesa/drivers/dri/intel/intel_span.h

index 0bb61b5..3a35a01 100644 (file)
@@ -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
    }
 }
 
index 9b6540d..2090e51 100644 (file)
@@ -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;
-}
-
index 6640e15..b2bd416 100644 (file)
@@ -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