projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965g: fix some reloc counts
[mesa.git]
/
src
/
gallium
/
drivers
/
llvmpipe
/
lp_bld_swizzle.c
diff --git
a/src/gallium/drivers/llvmpipe/lp_bld_swizzle.c
b/src/gallium/drivers/llvmpipe/lp_bld_swizzle.c
index ac7eed9379a51e7c917470471ef6df649762dd0f..64e81f7b1fed4b0babfdb37cb6df49f7908ac503 100644
(file)
--- a/
src/gallium/drivers/llvmpipe/lp_bld_swizzle.c
+++ b/
src/gallium/drivers/llvmpipe/lp_bld_swizzle.c
@@
-64,7
+64,7
@@
LLVMValueRef
lp_build_broadcast_scalar(struct lp_build_context *bld,
LLVMValueRef scalar)
{
lp_build_broadcast_scalar(struct lp_build_context *bld,
LLVMValueRef scalar)
{
- const
union
lp_type type = bld->type;
+ const
struct
lp_type type = bld->type;
LLVMValueRef res;
unsigned i;
LLVMValueRef res;
unsigned i;
@@
-83,7
+83,7
@@
lp_build_broadcast_aos(struct lp_build_context *bld,
LLVMValueRef a,
unsigned channel)
{
LLVMValueRef a,
unsigned channel)
{
- const
union
lp_type type = bld->type;
+ const
struct
lp_type type = bld->type;
const unsigned n = type.length;
unsigned i, j;
const unsigned n = type.length;
unsigned i, j;
@@
-115,7
+115,7
@@
lp_build_broadcast_aos(struct lp_build_context *bld,
* YY00 YY00 .... YY00
* YYYY YYYY .... YYYY <= output
*/
* YY00 YY00 .... YY00
* YYYY YYYY .... YYYY <= output
*/
-
union
lp_type type4 = type;
+
struct
lp_type type4 = type;
const char shifts[4][2] = {
{ 1, 2},
{-1, 2},
const char shifts[4][2] = {
{ 1, 2},
{-1, 2},
@@
-161,7
+161,7
@@
lp_build_broadcast_aos(struct lp_build_context *bld,
LLVMValueRef
lp_build_swizzle1_aos(struct lp_build_context *bld,
LLVMValueRef a,
LLVMValueRef
lp_build_swizzle1_aos(struct lp_build_context *bld,
LLVMValueRef a,
- unsigned char swizzle[4])
+
const
unsigned char swizzle[4])
{
const unsigned n = bld->type.length;
unsigned i, j;
{
const unsigned n = bld->type.length;
unsigned i, j;
@@
-192,7
+192,7
@@
LLVMValueRef
lp_build_swizzle2_aos(struct lp_build_context *bld,
LLVMValueRef a,
LLVMValueRef b,
lp_build_swizzle2_aos(struct lp_build_context *bld,
LLVMValueRef a,
LLVMValueRef b,
- unsigned char swizzle[4])
+
const
unsigned char swizzle[4])
{
const unsigned n = bld->type.length;
unsigned i, j;
{
const unsigned n = bld->type.length;
unsigned i, j;
@@
-201,11
+201,12
@@
lp_build_swizzle2_aos(struct lp_build_context *bld,
return lp_build_swizzle1_aos(bld, a, swizzle);
if(a == b) {
return lp_build_swizzle1_aos(bld, a, swizzle);
if(a == b) {
- swizzle[0] %= 4;
- swizzle[1] %= 4;
- swizzle[2] %= 4;
- swizzle[3] %= 4;
- return lp_build_swizzle1_aos(bld, a, swizzle);
+ unsigned char swizzle1[4];
+ swizzle1[0] = swizzle[0] % 4;
+ swizzle1[1] = swizzle[1] % 4;
+ swizzle1[2] = swizzle[2] % 4;
+ swizzle1[3] = swizzle[3] % 4;
+ return lp_build_swizzle1_aos(bld, a, swizzle1);
}
if(swizzle[0] % 4 == 0 &&
}
if(swizzle[0] % 4 == 0 &&