projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f3b7d4
)
st/nine: Fix use of D3DSP_NOSWIZZLE
author
Axel Davy
<axel.davy@ens.fr>
Thu, 8 Jan 2015 10:31:24 +0000
(11:31 +0100)
committer
Axel Davy
<axel.davy@ens.fr>
Thu, 5 Feb 2015 23:07:18 +0000
(
00:07
+0100)
D3DSP_NOSWIZZLE already contains the shift.
Detected with Clang.
Reviewed-by: Tiziano Bacocco <tizbac2@gmail.com>
Reviewed-by: David Heidelberg <david@ixit.cz>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
src/gallium/state_trackers/nine/nine_shader.c
patch
|
blob
|
history
diff --git
a/src/gallium/state_trackers/nine/nine_shader.c
b/src/gallium/state_trackers/nine/nine_shader.c
index 13630f0f55a9b40d11a82b8264484188c111b62c..2ba625ebf716a3b00d225d615e2eda5a13b83641 100644
(file)
--- a/
src/gallium/state_trackers/nine/nine_shader.c
+++ b/
src/gallium/state_trackers/nine/nine_shader.c
@@
-2778,7
+2778,7
@@
sm1_parse_get_param(struct shader_translator *tx, DWORD *reg, DWORD *rel)
*rel = (1 << 31) |
((D3DSPR_ADDR << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2) |
((D3DSPR_ADDR << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) |
-
(D3DSP_NOSWIZZLE << D3DSP_SWIZZLE_SHIFT)
;
+
D3DSP_NOSWIZZLE
;
else
*rel = TOKEN_NEXT(tx);
}