Skip to content

Fix 2384 handle cubemap in 2d sampler #2481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abaire wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −2
Open

Fix 2384 handle cubemap in 2d sampler #2481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions hw/xbox/nv2a/pgraph/glsl/psh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,9 @@ static const char *get_sampler_type(struct PixelShader *ps, enum PS_TEXTUREMODES
if (state->tex_x8y24[i] && ps->opts.vulkan) {
return "usampler2D";
}
if (state->tex_cubemap[i]) {
return samplerCube;
}
return sampler2D;
}
if (dim == 3) return sampler3D;
Expand Down Expand Up @@ -959,6 +962,11 @@ static MString* psh_convert(struct PixelShader *ps)
" }\n"
" return uv;\n"
"}\n"
"\n"
"vec3 remap2DToCube(vec3 texCoord2DProjective) {\n"
" vec2 st = (texCoord2DProjective.xy / texCoord2DProjective.z);"
" return normalize(vec3(1.0, st.y, -st.x));"
"}\n"
);

MString *clip = mstring_new();
Expand Down Expand Up @@ -1106,8 +1114,17 @@ static MString* psh_convert(struct PixelShader *ps)
apply_convolution_filter(ps, vars, i);
} else {
if (ps->state->dim_tex[i] == 2) {
mstring_append_fmt(vars, "vec4 t%d = textureProj(texSamp%d, %s(pT%d.xyw));\n",
i, i, tex_remap, i);
if (ps->state->tex_cubemap[i]) {
mstring_append_fmt(
vars,
"vec4 t%d = texture(texSamp%d, remap2DToCube(%s(pT%d.xyw)));\n",
i, i, tex_remap, i);
} else {
mstring_append_fmt(
vars,
"vec4 t%d = textureProj(texSamp%d, %s(pT%d.xyw));\n",
i, i, tex_remap, i);
}
} else if (ps->state->dim_tex[i] == 3) {
mstring_append_fmt(vars, "vec4 t%d = textureProj(texSamp%d, vec4(pT%d.xy, 0.0, pT%d.w));\n",
i, i, i, i);
Expand Down