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

switch to glsl 130, more than OpenGL 3.1 isn't needed

This commit is contained in:
degasus 2012-12-28 16:05:14 +01:00
parent 70c63ce6cf
commit 48ede4dd30
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
View File

@ -562,7 +562,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
// A few required defines and ones that will make our lives a lot easier // A few required defines and ones that will make our lives a lot easier
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding || g_ActiveConfig.backend_info.bSupportsGLSLUBO) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding || g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{ {
WRITE(p, "#version 330 compatibility\n"); WRITE(p, "#version 130\n");
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding)
WRITE(p, "#extension GL_ARB_shading_language_420pack : enable\n"); WRITE(p, "#extension GL_ARB_shading_language_420pack : enable\n");
if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)

2
Source/Core/VideoCommon/Src/TextureConversionShader.cpp
View File

@ -850,7 +850,7 @@ const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
// A few required defines and ones that will make our lives a lot easier // A few required defines and ones that will make our lives a lot easier
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding || g_ActiveConfig.backend_info.bSupportsGLSLUBO) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding || g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{ {
WRITE(p, "#version 330 compatibility\n"); WRITE(p, "#version 130\n");
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding)
WRITE(p, "#extension GL_ARB_shading_language_420pack : enable\n"); WRITE(p, "#extension GL_ARB_shading_language_420pack : enable\n");
if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)

2
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
View File

@ -190,7 +190,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
// A few required defines and ones that will make our lives a lot easier // A few required defines and ones that will make our lives a lot easier
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding || g_ActiveConfig.backend_info.bSupportsGLSLUBO) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding || g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{ {
WRITE(p, "#version 330 compatibility\n"); WRITE(p, "#version 130\n");
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding)
WRITE(p, "#extension GL_ARB_shading_language_420pack : enable\n"); WRITE(p, "#extension GL_ARB_shading_language_420pack : enable\n");
if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)

8
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
View File

@ -73,6 +73,7 @@ void PixelShaderCache::Init()
sprintf(pmatrixprog, "#version %s\n" sprintf(pmatrixprog, "#version %s\n"
"#extension GL_ARB_texture_rectangle : enable\n" "#extension GL_ARB_texture_rectangle : enable\n"
"%s\n" "%s\n"
"%s\n"
"%suniform sampler2DRect samp0;\n" "%suniform sampler2DRect samp0;\n"
"%s\n" "%s\n"
"%svec4 " I_COLORS"[7];\n" "%svec4 " I_COLORS"[7];\n"
@ -91,8 +92,9 @@ void PixelShaderCache::Init()
"Temp1.w = dot(Temp0, " I_COLORS"[%d]);\n" "Temp1.w = dot(Temp0, " I_COLORS"[%d]);\n"
"gl_FragData[0] = Temp1 + " I_COLORS"[%d];\n" "gl_FragData[0] = Temp1 + " I_COLORS"[%d];\n"
"}\n", "}\n",
(g_ActiveConfig.backend_info.bSupportsGLSLUBO || g_ActiveConfig.backend_info.bSupportsGLSLBinding) ? "330 compatibility" : "120", (g_ActiveConfig.backend_info.bSupportsGLSLUBO || g_ActiveConfig.backend_info.bSupportsGLSLBinding) ? "130" : "120",
g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "#extension GL_ARB_shading_language_420pack : enable" : "", g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "#extension GL_ARB_shading_language_420pack : enable" : "",
g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "#extension GL_ARB_uniform_buffer_object : enable" : "",
g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "layout(binding = 0) " : "", g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "layout(binding = 0) " : "",
g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "layout(std140) uniform PSBlock {" : "", g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "layout(std140) uniform PSBlock {" : "",
g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "uniform ", g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "uniform ",
@ -109,6 +111,7 @@ void PixelShaderCache::Init()
sprintf(pmatrixprog, "#version %s\n" sprintf(pmatrixprog, "#version %s\n"
"#extension GL_ARB_texture_rectangle : enable\n" "#extension GL_ARB_texture_rectangle : enable\n"
"%s\n" "%s\n"
"%s\n"
"%suniform sampler2DRect samp0;\n" "%suniform sampler2DRect samp0;\n"
"%s\n" "%s\n"
"%svec4 " I_COLORS"[5];\n" "%svec4 " I_COLORS"[5];\n"
@ -137,8 +140,9 @@ void PixelShaderCache::Init()
"R1.w = dot(R0, " I_COLORS"[%d]);\n" "R1.w = dot(R0, " I_COLORS"[%d]);\n"
"gl_FragData[0] = R1 * " I_COLORS"[%d];\n" "gl_FragData[0] = R1 * " I_COLORS"[%d];\n"
"}\n", "}\n",
(g_ActiveConfig.backend_info.bSupportsGLSLUBO || g_ActiveConfig.backend_info.bSupportsGLSLBinding) ? "330 compatibility" : "120", (g_ActiveConfig.backend_info.bSupportsGLSLUBO || g_ActiveConfig.backend_info.bSupportsGLSLBinding) ? "130" : "120",
g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "#extension GL_ARB_shading_language_420pack : enable" : "", g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "#extension GL_ARB_shading_language_420pack : enable" : "",
g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "#extension GL_ARB_uniform_buffer_object : enable" : "",
g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "layout(binding = 0) " : "", g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "layout(binding = 0) " : "",
g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "layout(std140) uniform PSBlock {" : "", g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "layout(std140) uniform PSBlock {" : "",
g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "uniform ", g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "uniform ",

6
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
View File

@ -72,9 +72,10 @@ void CreateRgbToYuyvProgram()
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding)
{ {
const char *FProgram = const char *FProgram =
"#version 330 compatibility\n" "#version 130\n"
"#extension GL_ARB_texture_rectangle : enable\n" "#extension GL_ARB_texture_rectangle : enable\n"
"#extension GL_ARB_shading_language_420pack : enable\n" "#extension GL_ARB_shading_language_420pack : enable\n"
"#extension GL_ARB_explicit_attrib_location : enable\n"
"layout(binding = 0) uniform sampler2DRect samp0;\n" "layout(binding = 0) uniform sampler2DRect samp0;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
@ -119,9 +120,10 @@ void CreateYuyvToRgbProgram()
if (g_ActiveConfig.backend_info.bSupportsGLSLBinding) if (g_ActiveConfig.backend_info.bSupportsGLSLBinding)
{ {
const char *FProgram = const char *FProgram =
"#version 330 compatibility\n" "#version 130\n"
"#extension GL_ARB_texture_rectangle : enable\n" "#extension GL_ARB_texture_rectangle : enable\n"
"#extension GL_ARB_shading_language_420pack : enable\n" "#extension GL_ARB_shading_language_420pack : enable\n"
"#extension GL_ARB_explicit_attrib_location : enable\n"
"layout(binding = 0) uniform sampler2DRect samp0;\n" "layout(binding = 0) uniform sampler2DRect samp0;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"