ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

psh: Use vec4 for all registers

This commit is contained in:
Jannik Vogel 2019-02-11 23:17:56 +01:00 committed by mborgerson
parent d225ff7a98
commit 52f897aa17
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hw/xbox/nv2a/nv2a_psh.c
View File

@ -235,7 +235,7 @@ static QString* get_var(struct PixelShader *ps, int reg, bool is_dest)
if (is_dest) {
return qstring_from_str("");
} else {
return qstring_from_str("0.0");
return qstring_from_str("vec4(0.0)");
}
break;
case PS_REGISTER_C0:
@ -280,9 +280,10 @@ static QString* get_var(struct PixelShader *ps, int reg, bool is_dest)
return qstring_from_str("r1");
case PS_REGISTER_V1R0_SUM:
add_var_ref(ps, "r0");
return qstring_from_str("(v1 + r0)");
return qstring_from_str("vec4(v1.rgb + r0.rgb, 0.0)");
case PS_REGISTER_EF_PROD:
return qstring_from_fmt("(%s * %s)", qstring_get_str(ps->varE),
return qstring_from_fmt("vec4(%s * %s, 0.0)",
qstring_get_str(ps->varE),
qstring_get_str(ps->varF));
default:
assert(false);
@ -295,28 +296,24 @@ static QString* get_input_var(struct PixelShader *ps, struct InputInfo in, bool
{
QString *reg = get_var(ps, in.reg, false);
if (strcmp(qstring_get_str(reg), "0.0") != 0
&& (in.reg != PS_REGISTER_EF_PROD
|| strstr(qstring_get_str(reg), ".a") == NULL)) {
switch (in.chan) {
case PS_CHANNEL_RGB:
if (is_alpha) {
qstring_append(reg, ".b");
} else {
qstring_append(reg, ".rgb");
}
break;
case PS_CHANNEL_ALPHA:
if (is_alpha) {
qstring_append(reg, ".a");
} else {
qstring_append(reg, ".aaa");
}
break;
default:
assert(false);
break;
switch (in.chan) {
case PS_CHANNEL_RGB:
if (is_alpha) {
qstring_append(reg, ".b");
} else {
qstring_append(reg, ".rgb");
}
break;
case PS_CHANNEL_ALPHA:
if (is_alpha) {
qstring_append(reg, ".a");
} else {
qstring_append(reg, ".aaa");
}
break;
default:
assert(false);
break;
}
QString *res;