mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-10 12:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented viewport scale and offset (but everything seems to flip now :( )

Browse Source
This commit is contained in:
elisha464 2014-02-10 17:57:32 +02:00
parent c2ec1cb709
commit bc38af04a5
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
rpcs3/Emu/GS/GL/GLGSRender.cpp
View File

@ -304,17 +304,39 @@ void GLGSRender::DisableVertexData()
void GLGSRender::InitVertexData() void GLGSRender::InitVertexData()
{ {
GLfloat scaleOffsetMat[16] = {1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f};
int l;
for(u32 i=0; i<m_transform_constants.GetCount(); ++i) for(u32 i=0; i<m_transform_constants.GetCount(); ++i)
{ {
const RSXTransformConstant& c = m_transform_constants[i]; const RSXTransformConstant& c = m_transform_constants[i];
const wxString name = wxString::Format("vc%u", c.id); const wxString name = wxString::Format("vc%u", c.id);
const int l = m_program.GetLocation(name); l = m_program.GetLocation(name);
checkForGlError("glGetUniformLocation " + name); checkForGlError("glGetUniformLocation " + name);
//ConLog.Write(name + " x: %.02f y: %.02f z: %.02f w: %.02f", c.x, c.y, c.z, c.w); //ConLog.Write(name + " x: %.02f y: %.02f z: %.02f w: %.02f", c.x, c.y, c.z, c.w);
glUniform4f(l, c.x, c.y, c.z, c.w); glUniform4f(l, c.x, c.y, c.z, c.w);
checkForGlError("glUniform4f " + name + wxString::Format(" %d [%f %f %f %f]", l, c.x, c.y, c.z, c.w)); checkForGlError("glUniform4f " + name + wxString::Format(" %d [%f %f %f %f]", l, c.x, c.y, c.z, c.w));
} }
// Scale
scaleOffsetMat[0] = (GLfloat&)methodRegisters[NV4097_SET_VIEWPORT_SCALE + (0x4*0)] / (m_width / 2.0f);
scaleOffsetMat[5] = (GLfloat&)methodRegisters[NV4097_SET_VIEWPORT_SCALE + (0x4*1)] / (m_height / 2.0f);
scaleOffsetMat[10] = (GLfloat&)methodRegisters[NV4097_SET_VIEWPORT_SCALE + (0x4*2)];
// Offset
scaleOffsetMat[3] = (GLfloat&)methodRegisters[NV4097_SET_VIEWPORT_OFFSET + (0x4*0)] - (m_width / 2.0f);
scaleOffsetMat[7] = (GLfloat&)methodRegisters[NV4097_SET_VIEWPORT_OFFSET + (0x4*1)] - (m_height / 2.0f);
scaleOffsetMat[11] = (GLfloat&)methodRegisters[NV4097_SET_VIEWPORT_OFFSET + (0x4*2)] - 1/2.0f;
scaleOffsetMat[3] /= m_width/2.0f;
scaleOffsetMat[7] /= m_height/2.0f;
l = m_program.GetLocation("scaleOffsetMat");
glUniformMatrix4fv(l, 1, false, scaleOffsetMat);
} }
void GLGSRender::InitFragmentData() void GLGSRender::InitFragmentData()
@ -433,19 +455,6 @@ void GLGSRender::WriteDepthBuffer()
glReadPixels(0, 0, RSXThread::m_width, RSXThread::m_height, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, &Memory[address]); glReadPixels(0, 0, RSXThread::m_width, RSXThread::m_height, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, &Memory[address]);
checkForGlError("glReadPixels"); checkForGlError("glReadPixels");
//TODO
//buffer rotating
static Array<u8> pixels;
pixels.SetCount(RSXThread::m_width * RSXThread::m_height);
u8* src = (u8*)Memory.VirtualToRealAddr(address);
for(u32 y=0; y<RSXThread::m_height; ++y)
{
memcpy(pixels + (RSXThread::m_height - y - 1) * RSXThread::m_width, src + y * RSXThread::m_width, RSXThread::m_width);
}
memcpy(&Memory[address], pixels.GetPtr(), pixels.GetCount());
GLuint depth_tex; GLuint depth_tex;
glGenTextures(1, &depth_tex); glGenTextures(1, &depth_tex);
glBindTexture(GL_TEXTURE_2D, depth_tex); glBindTexture(GL_TEXTURE_2D, depth_tex);
@ -749,13 +758,13 @@ void GLGSRender::ExecCMD()
if(m_set_viewport_horizontal && m_set_viewport_vertical) if(m_set_viewport_horizontal && m_set_viewport_vertical)
{ {
glViewport(m_viewport_x, RSXThread::m_height-m_viewport_y-m_viewport_h, m_viewport_w, m_viewport_h); //glViewport(m_viewport_x, m_viewport_y, m_viewport_w, m_viewport_h);
checkForGlError("glViewport"); checkForGlError("glViewport");
} }
if(m_set_scissor_horizontal && m_set_scissor_vertical) if(m_set_scissor_horizontal && m_set_scissor_vertical)
{ {
glScissor(m_scissor_x, RSXThread::m_height-m_scissor_y-m_scissor_h, m_scissor_w, m_scissor_h); glScissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h);
checkForGlError("glScissor"); checkForGlError("glScissor");
} }
@ -1094,7 +1103,7 @@ void GLGSRender::Flip()
if(m_set_scissor_horizontal && m_set_scissor_vertical) if(m_set_scissor_horizontal && m_set_scissor_vertical)
{ {
glScissor(m_scissor_x, RSXThread::m_height-m_scissor_y-m_scissor_h, m_scissor_w, m_scissor_h); glScissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h);
checkForGlError("glScissor"); checkForGlError("glScissor");
} }
} }

3
rpcs3/Emu/GS/GL/GLVertexProgram.cpp
View File

@ -319,7 +319,7 @@ wxString GLVertexDecompilerThread::BuildCode()
wxString f = wxEmptyString; wxString f = wxEmptyString;
f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n", m_funcs[0].name.mb_str(), BuildFuncBody(m_funcs[0]).mb_str()); f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%sgl_Position = gl_Position * scaleOffsetMat;\n}\n", m_funcs[0].name.mb_str(), BuildFuncBody(m_funcs[0]).mb_str());
for(uint i=1; i<m_funcs.GetCount(); ++i) for(uint i=1; i<m_funcs.GetCount(); ++i)
{ {
@ -329,6 +329,7 @@ wxString GLVertexDecompilerThread::BuildCode()
static const wxString& prot = static const wxString& prot =
"#version 330\n" "#version 330\n"
"\n" "\n"
"uniform mat4 scaleOffsetMat = mat4(1.0);\n"
"%s\n" "%s\n"
"%s\n" "%s\n"
"%s"; "%s";