Emulation/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-06-02 20:18:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into sync/qemu-7.2.0

Browse source
This commit is contained in:
Matt Borgerson 2023-07-15 17:24:01 -07:00
parent b5015e99b7 7bfb7c8537
commit 8da35b81a8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hw/xbox/nv2a/pgraph.c
View file

@ -6643,7 +6643,8 @@ static void pgraph_bind_textures(NV2AState *d)
1 << log_width, 1 << log_height, 1 << log_depth,
pitch,
cubemap ? "; cubemap" : "",
min_filter, mag_filter,
GET_MASK(filter, NV_PGRAPH_TEXFILTER0_MIN),
GET_MASK(filter, NV_PGRAPH_TEXFILTER0_MAG),
min_mipmap_level, max_mipmap_level, levels,
lod_bias);

1
hw/xbox/nv2a/shaders.c
View file

@ -505,7 +505,6 @@ GLSL_DEFINE(materialEmissionColor, GLSL_LTCTXA(NV_IGRAPH_XF_LTCTXA_CM_COL) ".xyz
case TEXGEN_OBJECT_LINEAR:
mstring_append_fmt(body, "oT%d.%c = dot(texPlane%c%d, position);\n",
i, c, cSuffix, i);
assert(false); /* Untested */
break;
case TEXGEN_SPHERE_MAP:
assert(j < 2); /* Channels S,T only! */