Browse Source

r300g: disable ARB_texture_swizzle if S3TC is enabled on r3xx-only

r3xx cannot swizzle compressed textures. r4xx+ is unaffected.

NOTE: This is a candidate for the 7.9 branch.
tags/android-x86-2.2
Marek Olšák 15 years ago
parent
commit
fcf6b353bf
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      src/gallium/drivers/r300/r300_screen.c

+ 2
- 1
src/gallium/drivers/r300/r300_screen.c View File

@@ -116,8 +116,9 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
case PIPE_CAP_TEXTURE_MIRROR_REPEAT:
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
case PIPE_CAP_TEXTURE_SWIZZLE:
return 1;
case PIPE_CAP_TEXTURE_SWIZZLE:
return util_format_s3tc_enabled ? r300screen->caps.dxtc_swizzle : 1;

/* Unsupported features (boolean caps). */
case PIPE_CAP_TIMER_QUERY:

Loading…
Cancel
Save