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

Merge pull request #970 from raven02/patch-5 

FP: switch to version 420
This commit is contained in:
B1ackDaemon 2015-01-18 23:04:44 +02:00
parent d9dd3a7eda 2c98a37512
commit e8d9ea116a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
View File

@ -350,7 +350,7 @@ std::string GLFragmentDecompilerThread::BuildCode()
p += param.Format();
}
return std::string("#version 330\n"
return std::string("#version 420\n"
"\n"
+ p + "\n"
"void main()\n{\n" + main + "}\n");

6
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -734,7 +734,7 @@ void DrawCursorObj::Draw()
void DrawCursorObj::InitializeShaders()
{
m_vp.shader =
"#version 330\n"
"#version 420\n"
"\n"
"uniform vec4 in_pos;\n"
"uniform vec2 in_tc;\n"
@ -747,10 +747,10 @@ void DrawCursorObj::InitializeShaders()
"}\n";
m_fp.shader =
"#version 330\n"
"#version 420\n"
"\n"
"in vec2 tc;\n"
"uniform sampler2D tex0;\n"
"layout (binding = 0) uniform sampler2D tex0;\n"
"layout (location = 0) out vec4 res;\n"
"\n"
"void main()\n"

2
rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
View File

@ -498,7 +498,7 @@ std::string GLVertexDecompilerThread::BuildCode()
}
static const std::string& prot =
"#version 330\n"
"#version 420\n"
"\n"
"uniform mat4 scaleOffsetMat = mat4(1.0);\n"
"%s\n"