Skip to content
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

Fog-Hacks and other stuff #19

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Fog-Hacks and other stuff #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7a4a873
psh: Rename c0 and c1 uniforms
JayFoxRox Aug 13, 2018
0c7fdf7
psh: Cleanup and dead code removal
JayFoxRox Aug 13, 2018
75eb05d
planned fixup for cleanup
JayFoxRox Aug 14, 2018
fb8f52d
psh: Refactor register combiner code
JayFoxRox Aug 13, 2018
8bdd938
psh: Fix GLSL error in MUX and assert that MSB is used
JayFoxRox Aug 13, 2018
5047175
psh: Use input mapping from NV_register_combiners GL extension
JayFoxRox Aug 13, 2018
6a12008
psh: Use output clamping from NV_register_combiners GL extension
JayFoxRox Aug 13, 2018
7ddacf2
psh: Use G as alpha in final combiner
JayFoxRox Aug 13, 2018
0e9f947
psh: Use vec3 for rgb, float for alpha and vec4 for registers
JayFoxRox Aug 13, 2018
f751619
Experimental use of GL vars
JayFoxRox Aug 13, 2018
82202d4
fixup GLSL bool-mix
JayFoxRox Aug 13, 2018
25577ea
assert muxsum only happens if no dot was done
JayFoxRox Aug 13, 2018
c847a7e
pgraph: Also re-upload surfaces if the address or pitch has changed
JayFoxRox Aug 14, 2018
e6f1a22
Add code for debugging an issue
JayFoxRox Aug 14, 2018
b1a455f
non-thaw hack: nan seems to disable fog? but what fog distance is used?
JayFoxRox Aug 14, 2018
c60d11d
Make sure that fogDistance is positive, is this correct?
JayFoxRox Aug 14, 2018
ae8b040
Use value which seem to be used in D3D fog calc
JayFoxRox Aug 14, 2018
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
17 changes: 10 additions & 7 deletions hw/xbox/nv2a/nv2a_pgraph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,16 +741,21 @@ void pgraph_method(NV2AState *d,
GET_MASK(parameter, NV097_SET_SURFACE_PITCH_COLOR);
pg->surface_zeta.pitch =
GET_MASK(parameter, NV097_SET_SURFACE_PITCH_ZETA);

pg->surface_color.buffer_dirty = true;
pg->surface_zeta.buffer_dirty = true;
break;
case NV097_SET_SURFACE_COLOR_OFFSET:
pgraph_update_surface(d, false, true, true);

pg->surface_color.offset = parameter;
pg->surface_color.buffer_dirty = true;
break;
case NV097_SET_SURFACE_ZETA_OFFSET:
pgraph_update_surface(d, false, true, true);

pg->surface_zeta.offset = parameter;
pg->surface_zeta.buffer_dirty = true;
break;

case NV097_SET_COMBINER_ALPHA_ICW ...
Expand Down Expand Up @@ -2742,7 +2747,7 @@ static void pgraph_shader_update_constants(PGRAPHState *pg,
int i, j;

/* update combiner constants */
for (i = 0; i<= 8; i++) {
for (i = 0; i < 9; i++) {
uint32_t constant[2];
if (i == 8) {
/* final combiner */
Expand Down Expand Up @@ -3370,9 +3375,9 @@ static void pgraph_update_surface_part(NV2AState *d, bool upload, bool color) {
}
surface->buffer_dirty = false;

#ifdef DEBUG_NV2A

uint8_t *out = data + surface->offset + 64;
NV2A_DPRINTF("upload_surface %s 0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", "
NV2A_GL_DPRINTF(true, "upload_surface %s 0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", "
"(0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", "
"%d %d, %d %d, %d) - %x %x %x %x\n",
color ? "color" : "zeta",
Expand All @@ -3384,7 +3389,7 @@ static void pgraph_update_surface_part(NV2AState *d, bool upload, bool color) {
pg->surface_shape.clip_height,
surface->pitch,
out[0], out[1], out[2], out[3]);
#endif

}

if (!upload && surface->draw_dirty) {
Expand Down Expand Up @@ -3416,9 +3421,8 @@ static void pgraph_update_surface_part(NV2AState *d, bool upload, bool color) {
surface->draw_dirty = false;
surface->write_enabled_cache = false;

#ifdef DEBUG_NV2A
uint8_t *out = data + surface->offset + 64;
NV2A_DPRINTF("read_surface %s 0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", "
NV2A_GL_DPRINTF(true, "read_surface %s 0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", "
"(0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", "
"%d %d, %d %d, %d) - %x %x %x %x\n",
color ? "color" : "zeta",
Expand All @@ -3429,7 +3433,6 @@ static void pgraph_update_surface_part(NV2AState *d, bool upload, bool color) {
pg->surface_shape.clip_width, pg->surface_shape.clip_height,
surface->pitch,
out[0], out[1], out[2], out[3]);
#endif
}

if (swizzle) {
Expand Down
Loading