r300g: reorder parts of translate_texformat

This commit is contained in:
Marek Olšák
2011-03-01 05:14:27 +01:00
parent 1dc204d145
commit 66d5de74c4
+14 -14
View File
@@ -205,20 +205,6 @@ uint32_t r300_translate_texformat(enum pipe_format format,
}
}
/* Add sign. */
for (i = 0; i < desc->nr_channels; i++) {
if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) {
result |= sign_bit[i];
}
}
/* This is truly a special format.
* It stores R8G8 and B is computed using sqrt(1 - R^2 - G^2)
* in the sampler unit. Also known as D3DFMT_CxV8U8. */
if (format == PIPE_FORMAT_R8G8Bx_SNORM) {
return R300_TX_FORMAT_CxV8U8 | result;
}
/* RGTC formats. */
if (desc->layout == UTIL_FORMAT_LAYOUT_RGTC) {
switch (format) {
@@ -235,6 +221,20 @@ uint32_t r300_translate_texformat(enum pipe_format format,
}
}
/* This is truly a special format.
* It stores R8G8 and B is computed using sqrt(1 - R^2 - G^2)
* in the sampler unit. Also known as D3DFMT_CxV8U8. */
if (format == PIPE_FORMAT_R8G8Bx_SNORM) {
return R300_TX_FORMAT_CxV8U8 | result;
}
/* Add sign. */
for (i = 0; i < desc->nr_channels; i++) {
if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) {
result |= sign_bit[i];
}
}
/* See whether the components are of the same size. */
for (i = 1; i < desc->nr_channels; i++) {
uniform = uniform && desc->channel[0].size == desc->channel[i].size;