diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-07-28 08:47:35 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-08-29 09:21:20 +0100 |
| commit | b060771612343e60ea61ed4503cad9f38c76912b (patch) | |
| tree | b73fb021e9410cc4582bf25a564d56e1e4efc5f3 | |
| parent | 42b15b26fd946c9511bd4bd5f23ec7e76e15507c (diff) | |
llvmpipe: Adjust for pixel layout changes.
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_pack.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_test.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_unpack.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_pack.c b/src/gallium/drivers/llvmpipe/lp_bld_pack.c index 690d1cc2e2..2383a07d72 100644 --- a/src/gallium/drivers/llvmpipe/lp_bld_pack.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_pack.c @@ -45,7 +45,7 @@ lp_build_pack_rgba(LLVMBuilderRef builder, desc = util_format_description(format); - assert(desc->layout == UTIL_FORMAT_LAYOUT_RGBA); + assert(desc->layout == UTIL_FORMAT_LAYOUT_ARITH); assert(desc->block.width == 1); assert(desc->block.height == 1); diff --git a/src/gallium/drivers/llvmpipe/lp_bld_test.c b/src/gallium/drivers/llvmpipe/lp_bld_test.c index cfce586f97..09947dd6bb 100644 --- a/src/gallium/drivers/llvmpipe/lp_bld_test.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_test.c @@ -70,12 +70,14 @@ struct pixel_test_case test_cases[] = {PIPE_FORMAT_A8R8G8B8_UNORM, 0xff000000, {0.0, 0.0, 0.0, 1.0}}, {PIPE_FORMAT_A8R8G8B8_UNORM, 0xffffffff, {1.0, 1.0, 1.0, 1.0}}, +#if 0 {PIPE_FORMAT_R8G8B8A8_UNORM, 0x00000000, {0.0, 0.0, 0.0, 0.0}}, {PIPE_FORMAT_R8G8B8A8_UNORM, 0x000000ff, {0.0, 0.0, 0.0, 1.0}}, {PIPE_FORMAT_R8G8B8A8_UNORM, 0x0000ff00, {0.0, 0.0, 1.0, 0.0}}, {PIPE_FORMAT_R8G8B8A8_UNORM, 0x00ff0000, {0.0, 1.0, 0.0, 0.0}}, {PIPE_FORMAT_R8G8B8A8_UNORM, 0xff000000, {1.0, 0.0, 0.0, 0.0}}, {PIPE_FORMAT_R8G8B8A8_UNORM, 0xffffffff, {1.0, 1.0, 1.0, 1.0}}, +#endif {PIPE_FORMAT_B8G8R8A8_UNORM, 0x00000000, {0.0, 0.0, 0.0, 0.0}}, {PIPE_FORMAT_B8G8R8A8_UNORM, 0x000000ff, {0.0, 0.0, 0.0, 1.0}}, diff --git a/src/gallium/drivers/llvmpipe/lp_bld_unpack.c b/src/gallium/drivers/llvmpipe/lp_bld_unpack.c index 9ed0b04104..cf6f831328 100644 --- a/src/gallium/drivers/llvmpipe/lp_bld_unpack.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_unpack.c @@ -45,7 +45,7 @@ lp_build_unpack_rgba(LLVMBuilderRef builder, desc = util_format_description(format); /* FIXME: Support more formats */ - assert(desc->layout == UTIL_FORMAT_LAYOUT_RGBA); + assert(desc->layout == UTIL_FORMAT_LAYOUT_ARITH); assert(desc->block.width == 1); assert(desc->block.height == 1); assert(desc->block.bits <= 32); |