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

Fiddling with msaa scaling.

This commit is contained in:
Ben Vanik 2015-03-15 02:28:39 -07:00
parent 86faacdb87
commit b07cd49281
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/xenia/gpu/gl4/command_processor.cc
View File

@ -1285,7 +1285,6 @@ bool CommandProcessor::ExecutePacketType3_DRAW_INDX_2(RingbufferReader* reader,
} }
bool CommandProcessor::ExecutePacketType3_SET_CONSTANT(RingbufferReader* reader, bool CommandProcessor::ExecutePacketType3_SET_CONSTANT(RingbufferReader* reader,
uint32_t packet, uint32_t packet,
uint32_t count) { uint32_t count) {
// load constant into chip and to memory // load constant into chip and to memory
@ -1911,11 +1910,11 @@ CommandProcessor::UpdateStatus CommandProcessor::UpdateViewportState() {
case MsaaSamples::k1X: case MsaaSamples::k1X:
break; break;
case MsaaSamples::k2X: case MsaaSamples::k2X:
// window_width_scalar = 2; window_width_scalar = 2;
break; break;
case MsaaSamples::k4X: case MsaaSamples::k4X:
window_width_scalar = 1; window_width_scalar = 2;
window_height_scalar = 1; window_height_scalar = 2;
break; break;
} }
@ -1940,6 +1939,7 @@ CommandProcessor::UpdateStatus CommandProcessor::UpdateViewportState() {
float vsx = vport_xscale_enable ? state_regs.pa_cl_vport_xscale : 1; float vsx = vport_xscale_enable ? state_regs.pa_cl_vport_xscale : 1;
float vsy = vport_yscale_enable ? state_regs.pa_cl_vport_yscale : 1; float vsy = vport_yscale_enable ? state_regs.pa_cl_vport_yscale : 1;
float vsz = vport_zscale_enable ? state_regs.pa_cl_vport_zscale : 1; float vsz = vport_zscale_enable ? state_regs.pa_cl_vport_zscale : 1;
window_width_scalar = window_height_scalar = 1;
float vpw = 2 * window_width_scalar * vsx; float vpw = 2 * window_width_scalar * vsx;
float vph = -2 * window_height_scalar * vsy; float vph = -2 * window_height_scalar * vsy;
float vpx = window_width_scalar * vox - vpw / 2; float vpx = window_width_scalar * vox - vpw / 2;
@ -2541,6 +2541,14 @@ bool CommandProcessor::IssueCopy() {
read_format = copy_dest_swap ? GL_BGRA : GL_RGBA; read_format = copy_dest_swap ? GL_BGRA : GL_RGBA;
read_type = GL_UNSIGNED_BYTE; read_type = GL_UNSIGNED_BYTE;
break; break;
case ColorFormat::k_16:
read_format = GL_R16;
read_type = GL_UNSIGNED_SHORT;
break;
case ColorFormat::k_16_FLOAT:
read_format = GL_R16;
read_type = GL_HALF_FLOAT;
break;
case ColorFormat::k_16_16: case ColorFormat::k_16_16:
read_format = GL_RG16; read_format = GL_RG16;
read_type = GL_UNSIGNED_SHORT; read_type = GL_UNSIGNED_SHORT;