diff options
| author | Marek Olšák <[email protected]> | 2012-05-11 16:42:20 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-05-11 16:42:20 +0200 |
| commit | 7435c043988dd83b430f3d3a7ca5a5a1b2f30d61 (patch) | |
| tree | 62b74a3cf10c6330ac3025f06b6c5d6bdd21da0b | |
| parent | bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a (diff) | |
| parent | 4d11a6a0c798301863d5b202703dcca37dc24e7c (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
| -rw-r--r-- | src/gallium/drivers/radeon/R600Instructions.td | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/R600Instructions.td b/src/gallium/drivers/radeon/R600Instructions.td index a18240f09bd..9b59171de43 100644 --- a/src/gallium/drivers/radeon/R600Instructions.td +++ b/src/gallium/drivers/radeon/R600Instructions.td @@ -227,7 +227,9 @@ def isEG : Predicate<"Subtarget.device()" def isCayman : Predicate<"Subtarget.device()" "->getDeviceFlag() == OCL_DEVICE_CAYMAN">; def isEGorCayman : Predicate<"Subtarget.device()" - "->getGeneration() >= AMDILDeviceInfo::HD5XXX">; + "->getGeneration() == AMDILDeviceInfo::HD5XXX" + "|| Subtarget.device()->getGeneration() ==" + "AMDILDeviceInfo::HD6XXX">; def isR600toCayman : Predicate< "Subtarget.device()->getGeneration() <= AMDILDeviceInfo::HD6XXX">; |