diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2013-02-05 13:37:57 -0800 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2013-02-08 18:54:40 -0800 |
| commit | 614982d320985c04e247293b54b66d7df5c19004 (patch) | |
| tree | 53a17cb7593ba82d1140bd218a7f192606cf332a /src/gallium/auxiliary/tgsi | |
| parent | 0a8043bb766f9c38af559438b646c3659614b103 (diff) | |
| download | external_mesa3d-614982d320985c04e247293b54b66d7df5c19004.zip external_mesa3d-614982d320985c04e247293b54b66d7df5c19004.tar.gz external_mesa3d-614982d320985c04e247293b54b66d7df5c19004.tar.bz2 | |
gallivm: fix up size queries for dx10 sviewinfo opcode
Need to calculate the number of mip levels (if it would be worthwile could
store it in dynamic state).
While here, the query code also used chan 2 for the lod value.
This worked with mesa state tracker but it seems safer to use chan 0.
Still passes piglit textureSize (with some handwaving), though the non-GL
parts are (largely) untested.
v2: clarify and expect the sviewinfo opcode to return ints, not floats,
just like the OpenGL textureSize (dx10 supports dst modifiers with resinfo).
Also simplify some code.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/tgsi')
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_info.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c index 94b6f60..f8a3cb6 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.c +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c @@ -293,7 +293,10 @@ tgsi_opcode_infer_src_type( uint opcode ) case TGSI_OPCODE_USHR: case TGSI_OPCODE_SHL: case TGSI_OPCODE_TXQ: + case TGSI_OPCODE_SVIEWINFO: case TGSI_OPCODE_TXF: + case TGSI_OPCODE_SAMPLE_I: + case TGSI_OPCODE_SAMPLE_I_MS: return TGSI_TYPE_UNSIGNED; case TGSI_OPCODE_MOD: case TGSI_OPCODE_I2F: @@ -343,6 +346,7 @@ tgsi_opcode_infer_dst_type( uint opcode ) case TGSI_OPCODE_SHL: case TGSI_OPCODE_TXQ: case TGSI_OPCODE_TXQ_LZ: + case TGSI_OPCODE_SVIEWINFO: return TGSI_TYPE_UNSIGNED; case TGSI_OPCODE_F2I: case TGSI_OPCODE_IDIV: |