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

svga: simplify array test in svga_init_shader_key_common() 

And squash commit a patch to silence a compiler warning (add
default case to the switch statement).

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Brian Paul 2017-11-14 09:34:29 -07:00
parent 45517f492b
commit 767c1eb436
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,18 +209,17 @@ svga_init_shader_key_common(const struct svga_context *svga,
assert(view->texture->target < (1 << 4)); /* texture_target:4 */
/* 1D/2D array textures with one slice are treated as non-arrays
* by the SVGA3D device. Convert the texture type here so that
* we emit the right TEX/SAMPLE instruction in the shader.
* by the SVGA3D device. Set the is_array flag only if we know that
* we have more than 1 element. This will be used to select shader
* instruction/resource types during shader translation.
*/
if (view->texture->target == PIPE_TEXTURE_1D_ARRAY ||
view->texture->target == PIPE_TEXTURE_2D_ARRAY) {
if (view->texture->array_size == 1) {
key->tex[i].is_array = 0;
}
else {
assert(view->texture->array_size > 1);
key->tex[i].is_array = 1;
}
switch (view->texture->target) {
case PIPE_TEXTURE_1D_ARRAY:
case PIPE_TEXTURE_2D_ARRAY:
key->tex[i].is_array = view->texture->array_size > 1;
break;
default:
; /* nothing / silence compiler warning */
}
assert(view->texture->nr_samples < (1 << 5)); /* 5-bit field */