diff options
| -rw-r--r-- | src/gallium/drivers/cell/ppu/cell_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/i965simple/brw_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv04/nv04_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv10/nv10_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv20/nv20_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 2 | 
13 files changed, 1 insertions, 25 deletions
| diff --git a/src/gallium/drivers/cell/ppu/cell_screen.c b/src/gallium/drivers/cell/ppu/cell_screen.c index bd48ce7005..9161747fdb 100644 --- a/src/gallium/drivers/cell/ppu/cell_screen.c +++ b/src/gallium/drivers/cell/ppu/cell_screen.c @@ -64,8 +64,6 @@ cell_get_param(struct pipe_screen *screen, int param)        return 1;     case PIPE_CAP_GLSL:        return 1; -   case PIPE_CAP_S3TC: -      return 0;     case PIPE_CAP_ANISOTROPIC_FILTER:        return 0;     case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915simple/i915_screen.c index 9f017a14cc..a1dd43c1bc 100644 --- a/src/gallium/drivers/i915simple/i915_screen.c +++ b/src/gallium/drivers/i915simple/i915_screen.c @@ -101,8 +101,6 @@ i915_get_param(struct pipe_screen *screen, int param)        return 1;     case PIPE_CAP_GLSL:        return 0; -   case PIPE_CAP_S3TC: -      return 0;     case PIPE_CAP_ANISOTROPIC_FILTER:        return 0;     case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/i965simple/brw_screen.c b/src/gallium/drivers/i965simple/brw_screen.c index b22e105f10..fb68fd624b 100644 --- a/src/gallium/drivers/i965simple/brw_screen.c +++ b/src/gallium/drivers/i965simple/brw_screen.c @@ -85,8 +85,6 @@ brw_get_param(struct pipe_screen *screen, int param)        return 1;     case PIPE_CAP_GLSL:        return 0; -   case PIPE_CAP_S3TC: -      return 0;     case PIPE_CAP_ANISOTROPIC_FILTER:        return 0;     case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 0ce1a37bd4..ff7ef8658a 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -65,8 +65,6 @@ llvmpipe_get_param(struct pipe_screen *screen, int param)        return 1;     case PIPE_CAP_GLSL:        return 1; -   case PIPE_CAP_S3TC: -      return 0;     case PIPE_CAP_ANISOTROPIC_FILTER:        return 0;     case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/nv04/nv04_screen.c b/src/gallium/drivers/nv04/nv04_screen.c index ff2febb668..170ce3eb7e 100644 --- a/src/gallium/drivers/nv04/nv04_screen.c +++ b/src/gallium/drivers/nv04/nv04_screen.c @@ -16,8 +16,6 @@ nv04_screen_get_param(struct pipe_screen *screen, int param)  		return 0;  	case PIPE_CAP_GLSL:  		return 0; -	case PIPE_CAP_S3TC: -		return 0;  	case PIPE_CAP_ANISOTROPIC_FILTER:  		return 0;  	case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/nv10/nv10_screen.c b/src/gallium/drivers/nv10/nv10_screen.c index 4469b22d91..ee5901e743 100644 --- a/src/gallium/drivers/nv10/nv10_screen.c +++ b/src/gallium/drivers/nv10/nv10_screen.c @@ -15,8 +15,6 @@ nv10_screen_get_param(struct pipe_screen *screen, int param)  		return 0;  	case PIPE_CAP_GLSL:  		return 0; -	case PIPE_CAP_S3TC: -		return 0;  	case PIPE_CAP_ANISOTROPIC_FILTER:  		return 1;  	case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/nv20/nv20_screen.c b/src/gallium/drivers/nv20/nv20_screen.c index e6924ad71e..4eeacd1afd 100644 --- a/src/gallium/drivers/nv20/nv20_screen.c +++ b/src/gallium/drivers/nv20/nv20_screen.c @@ -15,8 +15,6 @@ nv20_screen_get_param(struct pipe_screen *screen, int param)  		return 0;  	case PIPE_CAP_GLSL:  		return 0; -	case PIPE_CAP_S3TC: -		return 0;  	case PIPE_CAP_ANISOTROPIC_FILTER:  		return 1;  	case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nv30/nv30_screen.c index f8285e4455..41af38450b 100644 --- a/src/gallium/drivers/nv30/nv30_screen.c +++ b/src/gallium/drivers/nv30/nv30_screen.c @@ -22,8 +22,6 @@ nv30_screen_get_param(struct pipe_screen *pscreen, int param)  		return 1;  	case PIPE_CAP_GLSL:  		return 0; -	case PIPE_CAP_S3TC: -		return 0;  	case PIPE_CAP_ANISOTROPIC_FILTER:  		return 1;  	case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/nv40/nv40_screen.c b/src/gallium/drivers/nv40/nv40_screen.c index 5d2a4216c5..bd13dfddd1 100644 --- a/src/gallium/drivers/nv40/nv40_screen.c +++ b/src/gallium/drivers/nv40/nv40_screen.c @@ -21,8 +21,6 @@ nv40_screen_get_param(struct pipe_screen *pscreen, int param)  		return 1;  	case PIPE_CAP_GLSL:  		return 0; -	case PIPE_CAP_S3TC: -		return 1;  	case PIPE_CAP_ANISOTROPIC_FILTER:  		return 1;  	case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c index 7adaaaa135..3b08e1b89f 100644 --- a/src/gallium/drivers/nv50/nv50_screen.c +++ b/src/gallium/drivers/nv50/nv50_screen.c @@ -87,8 +87,6 @@ nv50_screen_get_param(struct pipe_screen *pscreen, int param)  		return 1;  	case PIPE_CAP_GLSL:  		return 0; -	case PIPE_CAP_S3TC: -		return 1;  	case PIPE_CAP_ANISOTROPIC_FILTER:  		return 1;  	case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 593178c50b..3b5b1bbd37 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -93,8 +93,6 @@ static int r300_get_param(struct pipe_screen* pscreen, int param)              } else {                  return 0;              } -        case PIPE_CAP_S3TC: -            return 1;          case PIPE_CAP_ANISOTROPIC_FILTER:              return 1;          case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index da97e7ac04..ce77018415 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -65,8 +65,6 @@ softpipe_get_param(struct pipe_screen *screen, int param)        return 1;     case PIPE_CAP_GLSL:        return 1; -   case PIPE_CAP_S3TC: -      return 0;     case PIPE_CAP_ANISOTROPIC_FILTER:        return 0;     case PIPE_CAP_POINT_SPRITE: diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index b01ab6d137..f252d6df00 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -281,7 +281,7 @@ enum pipe_transfer_usage {  #define PIPE_CAP_NPOT_TEXTURES           2  #define PIPE_CAP_TWO_SIDED_STENCIL       3  #define PIPE_CAP_GLSL                    4  /* XXX need something better */ -#define PIPE_CAP_S3TC                    5 +#define PIPE_CAP_S3TC                    5  /* XXX: deprecated; cap determined via supported sampler formats */  #define PIPE_CAP_ANISOTROPIC_FILTER      6  #define PIPE_CAP_POINT_SPRITE            7  #define PIPE_CAP_MAX_RENDER_TARGETS      8 | 
