KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svga: Always set the alpha value to 1 when sampling using an XRGB view 

If the XRGB view is sampling from an ARGB svga format, change
PIPE_SWIZZLE_W to PIPE_SWIZZLE_1 for all channels.
Previously we unconditionally set PIPE_SWIZZLE_1 on the alpha channel which
could be both insufficient and incorrect.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Thomas Hellstrom 2017-05-30 15:54:38 +02:00
parent df4d6003dc
commit 2c4ec3f93f
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/gallium/drivers/svga/svga_shader.c
View File

@ -31,7 +31,6 @@
#include "svga_format.h" #include "svga_format.h"
#include "svga_shader.h" #include "svga_shader.h"
#include "svga_resource_texture.h" #include "svga_resource_texture.h"
#include "svga3d_surfacedefs.h"
/** /**
@ -163,6 +162,25 @@ svga_remap_generic_index(int8_t remap_table[MAX_GENERIC_VARYING],
return remap_table[generic_index]; return remap_table[generic_index];
} }
static const enum pipe_swizzle copy_alpha[PIPE_SWIZZLE_MAX] = {
PIPE_SWIZZLE_X,
PIPE_SWIZZLE_Y,
PIPE_SWIZZLE_Z,
PIPE_SWIZZLE_W,
PIPE_SWIZZLE_0,
PIPE_SWIZZLE_1,
PIPE_SWIZZLE_NONE
};
static const enum pipe_swizzle set_alpha[PIPE_SWIZZLE_MAX] = {
PIPE_SWIZZLE_X,
PIPE_SWIZZLE_Y,
PIPE_SWIZZLE_Z,
PIPE_SWIZZLE_1,
PIPE_SWIZZLE_0,
PIPE_SWIZZLE_1,
PIPE_SWIZZLE_NONE
};
/** /**
* Initialize the shader-neutral fields of svga_compile_key from context * Initialize the shader-neutral fields of svga_compile_key from context
@ -174,6 +192,7 @@ svga_init_shader_key_common(const struct svga_context *svga,
struct svga_compile_key *key) struct svga_compile_key *key)
{ {
unsigned i, idx = 0; unsigned i, idx = 0;
const enum pipe_swizzle *swizzle_tab;
assert(shader < ARRAY_SIZE(svga->curr.num_sampler_views)); assert(shader < ARRAY_SIZE(svga->curr.num_sampler_views));
@ -212,22 +231,20 @@ svga_init_shader_key_common(const struct svga_context *svga,
++key->num_unnormalized_coords; ++key->num_unnormalized_coords;
} }
key->tex[i].swizzle_r = view->swizzle_r; swizzle_tab = (!util_format_has_alpha(view->format) &&
key->tex[i].swizzle_g = view->swizzle_g; svga_texture_device_format_has_alpha(view->texture)) ?
key->tex[i].swizzle_b = view->swizzle_b; set_alpha : copy_alpha;
/* If we have a non-alpha view into an svga3d surface with an /* If we have a non-alpha view into an svga3d surface with an
* alpha channel, then explicitly set the alpha channel to 1 * alpha channel, then explicitly set the alpha channel to 1
* when sampling. Note that we need to check the svga3d format * when sampling. Note that we need to check the
* in the svga texture key, since the imported format is * actual device format to cover also imported surface cases.
* stored here and it may differ from the gallium format.
*/ */
if (!util_format_has_alpha(view->format) &&
svga_texture_device_format_has_alpha(view->texture)) { key->tex[i].swizzle_r = swizzle_tab[view->swizzle_r];
key->tex[i].swizzle_a = PIPE_SWIZZLE_1; key->tex[i].swizzle_g = swizzle_tab[view->swizzle_g];
} else { key->tex[i].swizzle_b = swizzle_tab[view->swizzle_b];
key->tex[i].swizzle_a = view->swizzle_a; key->tex[i].swizzle_a = swizzle_tab[view->swizzle_a];
}
} }
} }
} }