From f3984fbe3310682c5f4d4821edcfe59d9430d957 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 21 Sep 2012 10:38:03 +0200 Subject: [PATCH] intel: Remove dead intel_format_to_rb_datatype. This was for some of the old spans-related code that is now gone. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/intel/intel_tex.h | 2 -- src/mesa/drivers/dri/intel/intel_tex_format.c | 50 --------------------------- 2 files changed, 52 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_tex.h b/src/mesa/drivers/dri/intel/intel_tex.h index 777574d..6fa5b40 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.h +++ b/src/mesa/drivers/dri/intel/intel_tex.h @@ -42,8 +42,6 @@ void intelInitTextureSubImageFuncs(struct dd_function_table *functions); void intelInitTextureCopyImageFuncs(struct dd_function_table *functions); -GLenum intel_mesa_format_to_rb_datatype(gl_format format); - void intelSetTexBuffer(__DRIcontext *pDRICtx, GLint target, __DRIdrawable *pDraw); void intelSetTexBuffer2(__DRIcontext *pDRICtx, diff --git a/src/mesa/drivers/dri/intel/intel_tex_format.c b/src/mesa/drivers/dri/intel/intel_tex_format.c index f53054d..0902cdd 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_format.c +++ b/src/mesa/drivers/dri/intel/intel_tex_format.c @@ -3,56 +3,6 @@ #include "main/enums.h" #include "main/formats.h" -/** - * Returns the renderbuffer DataType for a MESA_FORMAT. - */ -GLenum -intel_mesa_format_to_rb_datatype(gl_format format) -{ - switch (format) { - case MESA_FORMAT_ARGB8888: - case MESA_FORMAT_XRGB8888: - case MESA_FORMAT_SARGB8: - case MESA_FORMAT_R8: - case MESA_FORMAT_GR88: - case MESA_FORMAT_A8: - case MESA_FORMAT_I8: - case MESA_FORMAT_L8: - case MESA_FORMAT_AL88: - case MESA_FORMAT_RGB565: - case MESA_FORMAT_ARGB1555: - case MESA_FORMAT_ARGB4444: - case MESA_FORMAT_S8: - return GL_UNSIGNED_BYTE; - case MESA_FORMAT_R16: - case MESA_FORMAT_RG1616: - case MESA_FORMAT_Z16: - return GL_UNSIGNED_SHORT; - case MESA_FORMAT_X8_Z24: - return GL_UNSIGNED_INT; - case MESA_FORMAT_S8_Z24: - return GL_UNSIGNED_INT_24_8_EXT; - case MESA_FORMAT_RGBA_FLOAT32: - case MESA_FORMAT_RG_FLOAT32: - case MESA_FORMAT_R_FLOAT32: - case MESA_FORMAT_INTENSITY_FLOAT32: - case MESA_FORMAT_LUMINANCE_FLOAT32: - case MESA_FORMAT_ALPHA_FLOAT32: - case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32: - return GL_FLOAT; - - /* The core depthstencil wrappers demand this. */ - case MESA_FORMAT_Z32_FLOAT_X24S8: - return GL_FLOAT_32_UNSIGNED_INT_24_8_REV; - - default: - /* Unsupported format. We may hit this when people ask for FBO-incomplete - * formats. - */ - return GL_NONE; - } -} - int intel_compressed_num_bytes(GLuint mesaFormat) { GLuint bw, bh; -- 2.7.4