From 788075309957f2075907435a4e2775d33742d5fd Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 19 Jan 2015 04:41:22 +0800 Subject: [PATCH 1/3] FP: switch to version 420 --- rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index 2eb1df43dc..ea6bb1a0bb 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -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"); From 546619ee240e97c6145bc90af1d825e79634c826 Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 19 Jan 2015 04:42:00 +0800 Subject: [PATCH 2/3] VP: switch to version 420 --- rpcs3/Emu/RSX/GL/GLVertexProgram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp index bdd4960266..5b730555a5 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp @@ -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" From 2c98a37512731f93a94b0700e4f1a9e6982b8e5b Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 19 Jan 2015 04:42:46 +0800 Subject: [PATCH 3/3] Init: switch to version 420 layout (binding = 0) --- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index d3208be762..35ec0a7dc5 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -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"