mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-09 08:58:02 +02:00
nine: Fix assert in tx_src_param
A previous commit cleaned up the asserts but the last part of this assert looks like it got mixed up. It should have allowed param->rel for D3DSPR_INPUT if version is 3.0. Instead it does && on the enum value D3DSPR_ADDR which is of course always true, with the version check. The result is that we miss input validation with version 3.0. Spotted by a compile warning Fixes:5974401a4a("st/nine: Regroup param->rel tests") Reviewed-by: Axel Davy davyaxel0@gmail.com Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11880> (cherry picked from commit71a5bcb865)
This commit is contained in:
parent
4f7b4ba7f8
commit
8b4a8972a8
2 changed files with 2 additions and 2 deletions
|
|
@ -292,7 +292,7 @@
|
|||
"description": "nine: Fix assert in tx_src_param",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": "5974401a4adba2373232fc72940db96c32bbb4b6"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1010,7 +1010,7 @@ tx_src_param(struct shader_translator *tx, const struct sm1_src_param *param)
|
|||
struct ureg_dst tmp;
|
||||
|
||||
assert(!param->rel || (IS_VS && param->file == D3DSPR_CONST) ||
|
||||
(D3DSPR_ADDR && tx->version.major == 3));
|
||||
(param->file == D3DSPR_INPUT && tx->version.major == 3));
|
||||
|
||||
switch (param->file)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue