diff options
| author | Eric Anholt <eric@anholt.net> | 2010-03-04 15:33:21 -0800 | 
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-03-04 16:50:51 -0800 | 
| commit | 7cbc4c07ee85782d5da3e2db3c4e072ca498ff07 (patch) | |
| tree | a006b9b61e57797fe9ba002a992893e70413feaa | |
| parent | 391b396f3fb300a912e6d9bfbf26f49cc30e52df (diff) | |
intel: Remove the unused s8 spans code.  Not hit during no_rast piglit.
Shaves 5.5k off of the driver.
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_span.c | 60 | 
1 files changed, 1 insertions, 59 deletions
| diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c index 0072bb15fc..2fcb2d843c 100644 --- a/src/mesa/drivers/dri/intel/intel_span.c +++ b/src/mesa/drivers/dri/intel/intel_span.c @@ -352,40 +352,6 @@ static uint32_t y_tile_swizzle(struct intel_renderbuffer *irb,  #define INTEL_TAG(name) name##_z24_x8  #include "intel_depthtmp.h" - -/** - ** 8-bit stencil function (XXX FBO: This is obsolete) - **/ -/* XXX */ -#define WRITE_STENCIL(_x, _y, d) pwrite_8(irb, NO_TILE(_x, _y) + 3, d) -#define READ_STENCIL(d, _x, _y) d = pread_8(irb, NO_TILE(_x, _y) + 3); -#define TAG(x) intel_gttmap_##x##_z24_s8 -#include "stenciltmp.h" - -/** - ** 8-bit stencil function (XXX FBO: This is obsolete) - **/ -#define WRITE_STENCIL(_x, _y, d) pwrite_8(irb, NO_TILE(_x, _y) + 3, d) -#define READ_STENCIL(d, _x, _y) d = pread_8(irb, NO_TILE(_x, _y) + 3); -#define TAG(x) intel##x##_z24_s8 -#include "stenciltmp.h" - -/** - ** 8-bit x-tile stencil function (XXX FBO: This is obsolete) - **/ -#define WRITE_STENCIL(_x, _y, d) pwrite_8(irb, X_TILE(_x, _y) + 3, d) -#define READ_STENCIL(d, _x, _y) d = pread_8(irb, X_TILE(_x, _y) + 3); -#define TAG(x) intel_XTile_##x##_z24_s8 -#include "stenciltmp.h" - -/** - ** 8-bit y-tile stencil function (XXX FBO: This is obsolete) - **/ -#define WRITE_STENCIL(_x, _y, d) pwrite_8(irb, Y_TILE(_x, _y) + 3, d) -#define READ_STENCIL(d, _x, _y) d = pread_8(irb, Y_TILE(_x, _y) + 3) -#define TAG(x) intel_YTile_##x##_z24_s8 -#include "stenciltmp.h" -  void  intel_renderbuffer_map(struct intel_context *intel, struct gl_renderbuffer *rb)  { @@ -615,19 +581,8 @@ intel_set_span_functions(struct intel_context *intel,  	 intel_gttmap_InitDepthPointers_z16(rb);  	 break;        case MESA_FORMAT_X8_Z24: -	 intel_gttmap_InitDepthPointers_z24_x8(rb); -	 break;        case MESA_FORMAT_S8_Z24: -	 /* There are a few different ways SW asks us to access the S8Z24 data: -	  * Z24 depth-only depth reads -	  * S8Z24 depth reads -	  * S8Z24 stencil reads. -	  */ -	 if (rb->Format == MESA_FORMAT_S8_Z24) { -	    intel_gttmap_InitDepthPointers_z24_x8(rb); -	 } else if (rb->Format == MESA_FORMAT_S8) { -	    intel_gttmap_InitStencilPointers_z24_s8(rb); -	 } +	 intel_gttmap_InitDepthPointers_z24_x8(rb);  	 break;        default:  	 _mesa_problem(NULL, @@ -747,19 +702,6 @@ intel_set_span_functions(struct intel_context *intel,  	    intel_YTile_InitDepthPointers_z24_x8(rb);  	    break;  	 } -      } else if (rb->Format == MESA_FORMAT_S8) { -	 switch (tiling) { -	 case I915_TILING_NONE: -	 default: -	    intelInitStencilPointers_z24_s8(rb); -	    break; -	 case I915_TILING_X: -	    intel_XTile_InitStencilPointers_z24_s8(rb); -	    break; -	 case I915_TILING_Y: -	    intel_YTile_InitStencilPointers_z24_s8(rb); -	    break; -	 }        } else {  	 _mesa_problem(NULL,  		       "Unexpected ActualFormat in intelSetSpanFunctions"); | 
