fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-20 03:20:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

crocus: wm_prog_key::key_alpha_test uses GL enums

Browse source 
Fixes: f3630548f1 ("crocus: initial gallium driver for Intel gfx 4-7")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14141>
(cherry picked from commit 4175ed5099)
This commit is contained in:
Jason Ekstrand 2021-12-09 18:20:55 -06:00 • committed by Eric Engestrom
parent 7aca70e17b
commit 0d8d9dde7b
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2101,7 +2101,7 @@
"description": "crocus: wm_prog_key::key_alpha_test uses GL enums",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "f3630548f1da904ec6c63b43ece7e68afdb8867e"
},

18
src/gallium/drivers/crocus/crocus_state.c
View file

@ -4750,6 +4750,22 @@ crocus_populate_gs_key(const struct crocus_context *ice,
key->nr_userclip_plane_consts = cso_rast->num_clip_plane_consts;
}
static inline GLenum
compare_func_to_gl(enum pipe_compare_func pipe_func)
{
static const unsigned map[] = {
[PIPE_FUNC_NEVER] = GL_NEVER,
[PIPE_FUNC_LESS] = GL_LESS,
[PIPE_FUNC_EQUAL] = GL_EQUAL,
[PIPE_FUNC_LEQUAL] = GL_LEQUAL,
[PIPE_FUNC_GREATER] = GL_GREATER,
[PIPE_FUNC_NOTEQUAL] = GL_NOTEQUAL,
[PIPE_FUNC_GEQUAL] = GL_GEQUAL,
[PIPE_FUNC_ALWAYS] = GL_ALWAYS,
};
return map[pipe_func];
}
/**
* Populate FS program key fields based on the current state.
*/
@ -4836,7 +4852,7 @@ crocus_populate_fs_key(const struct crocus_context *ice,
#if GFX_VER <= 5
if (fb->nr_cbufs > 1 && zsa->cso.alpha_enabled) {
key->alpha_test_func = zsa->cso.alpha_func;
key->alpha_test_func = compare_func_to_gl(zsa->cso.alpha_func);
key->alpha_test_ref = zsa->cso.alpha_ref_value;
}
#endif