summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2004-10-04 02:54:49 +0000
committerIan Romanick <idr@us.ibm.com>2004-10-04 02:54:49 +0000
commit5e243bd57e4c53206a986d67a2bd05450e7fc238 (patch)
tree16122a0bb0dcc51b815276a1671a5d017d5ba20f
parente8250c6271c87c0dbe90214a86d5be7b3528c048 (diff)
The alpha post-scale and the RGB post-scale were mistakenly reversed.
-rw-r--r--src/mesa/drivers/dri/unichrome/via_texcombine.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_texcombine.c b/src/mesa/drivers/dri/unichrome/via_texcombine.c
index 9559cb30cb..ea4849f90d 100644
--- a/src/mesa/drivers/dri/unichrome/via_texcombine.c
+++ b/src/mesa/drivers/dri/unichrome/via_texcombine.c
@@ -20,9 +20,13 @@
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file via_texcombine.c
+ * Calculate texture combine hardware state.
*
- * Authors:
- * Ian Romanick <idr@us.ibm.com>
+ * \author Ian Romanick <idr@us.ibm.com>
*/
#include <stdio.h>
@@ -106,8 +110,8 @@ viaTexCombineState( viaContextPtr vmesa,
unsigned alpha = 0;
unsigned bias = 0;
unsigned op = 0;
- unsigned a_shift = combine->ScaleShiftRGB;
- unsigned c_shift = combine->ScaleShiftA;
+ unsigned a_shift = combine->ScaleShiftA;
+ unsigned c_shift = combine->ScaleShiftRGB;
unsigned i;
unsigned constant_color[3];
unsigned ordered_constant_color[4];
@@ -236,7 +240,7 @@ viaTexCombineState( viaContextPtr vmesa,
color |= (color_arg[0] << INPUT_B_SHIFT)
| (CONST_ONE << INPUT_A_SHIFT);
-
+
bias |= (color_arg[1] << INPUT_BiasC_SHIFT);
ordered_constant_color[1] = constant_color[0];
ordered_constant_color[3] = constant_color[1];