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

Merge pull request #3226 from Tilka/shadergen 

VideoCommon: return code/uid from shader gens
This commit is contained in:
Scott Mansell 2015-11-04 13:42:49 +13:00
parent 9cc4cffa1d 71d1eb3c31
commit e161e714c7
10 changed files with 48 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp
View File

@ -190,12 +190,10 @@ void GeometryShaderCache::Shutdown()
bool GeometryShaderCache::SetShader(u32 primitive_type) bool GeometryShaderCache::SetShader(u32 primitive_type)
{ {
GeometryShaderUid uid; GeometryShaderUid uid = GetGeometryShaderUid(primitive_type, API_D3D);
GetGeometryShaderUid(uid, primitive_type, API_D3D);
if (g_ActiveConfig.bEnableShaderDebugging) if (g_ActiveConfig.bEnableShaderDebugging)
{ {
ShaderCode code; ShaderCode code = GenerateGeometryShaderCode(primitive_type, API_D3D);
GenerateGeometryShaderCode(code, primitive_type, API_D3D);
geometry_uid_checker.AddToIndexAndCheck(code, uid, "Geometry", "g"); geometry_uid_checker.AddToIndexAndCheck(code, uid, "Geometry", "g");
} }
@ -231,8 +229,7 @@ bool GeometryShaderCache::SetShader(u32 primitive_type)
} }
// Need to compile a new shader // Need to compile a new shader
ShaderCode code; ShaderCode code = GenerateGeometryShaderCode(primitive_type, API_D3D);
GenerateGeometryShaderCode(code, primitive_type, API_D3D);
D3DBlob* pbytecode; D3DBlob* pbytecode;
if (!D3D::CompileGeometryShader(code.GetBuffer(), &pbytecode)) if (!D3D::CompileGeometryShader(code.GetBuffer(), &pbytecode))

9
Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
View File

@ -527,12 +527,10 @@ void PixelShaderCache::Shutdown()
bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode) bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode)
{ {
PixelShaderUid uid; PixelShaderUid uid = GetPixelShaderUid(dstAlphaMode, API_D3D);
GetPixelShaderUid(uid, dstAlphaMode, API_D3D);
if (g_ActiveConfig.bEnableShaderDebugging) if (g_ActiveConfig.bEnableShaderDebugging)
{ {
ShaderCode code; ShaderCode code = GeneratePixelShaderCode(dstAlphaMode, API_D3D);
GeneratePixelShaderCode(code, dstAlphaMode, API_D3D);
pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p"); pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p");
} }
@ -561,8 +559,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode)
} }
// Need to compile a new shader // Need to compile a new shader
ShaderCode code; ShaderCode code = GeneratePixelShaderCode(dstAlphaMode, API_D3D);
GeneratePixelShaderCode(code, dstAlphaMode, API_D3D);
D3DBlob* pbytecode; D3DBlob* pbytecode;
if (!D3D::CompilePixelShader(code.GetBuffer(), &pbytecode)) if (!D3D::CompilePixelShader(code.GetBuffer(), &pbytecode))

9
Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
View File

@ -186,12 +186,10 @@ void VertexShaderCache::Shutdown()
bool VertexShaderCache::SetShader() bool VertexShaderCache::SetShader()
{ {
VertexShaderUid uid; VertexShaderUid uid = GetVertexShaderUid(API_D3D);
GetVertexShaderUid(uid, API_D3D);
if (g_ActiveConfig.bEnableShaderDebugging) if (g_ActiveConfig.bEnableShaderDebugging)
{ {
ShaderCode code; ShaderCode code = GenerateVertexShaderCode(API_D3D);
GenerateVertexShaderCode(code, API_D3D);
vertex_uid_checker.AddToIndexAndCheck(code, uid, "Vertex", "v"); vertex_uid_checker.AddToIndexAndCheck(code, uid, "Vertex", "v");
} }
@ -216,8 +214,7 @@ bool VertexShaderCache::SetShader()
return (entry.shader != nullptr); return (entry.shader != nullptr);
} }
ShaderCode code; ShaderCode code = GenerateVertexShaderCode(API_D3D);
GenerateVertexShaderCode(code, API_D3D);
D3DBlob* pbytecode = nullptr; D3DBlob* pbytecode = nullptr;
D3D::CompileVertexShader(code.GetBuffer(), &pbytecode); D3D::CompileVertexShader(code.GetBuffer(), &pbytecode);

23
Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View File

@ -211,13 +211,11 @@ SHADER* ProgramShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 primitive_
last_entry = &newentry; last_entry = &newentry;
newentry.in_cache = 0; newentry.in_cache = 0;
ShaderCode vcode; ShaderCode vcode = GenerateVertexShaderCode(API_OPENGL);
ShaderCode pcode; ShaderCode pcode = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL);
ShaderCode gcode; ShaderCode gcode;
GenerateVertexShaderCode(vcode, API_OPENGL);
GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL);
if (g_ActiveConfig.backend_info.bSupportsGeometryShaders && !uid.guid.GetUidData()->IsPassthrough()) if (g_ActiveConfig.backend_info.bSupportsGeometryShaders && !uid.guid.GetUidData()->IsPassthrough())
GenerateGeometryShaderCode(gcode, primitive_type, API_OPENGL); gcode = GenerateGeometryShaderCode(primitive_type, API_OPENGL);
if (g_ActiveConfig.bEnableShaderDebugging) if (g_ActiveConfig.bEnableShaderDebugging)
{ {
@ -395,22 +393,19 @@ GLuint ProgramShaderCache::CompileSingleShader(GLuint type, const char* code)
void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 primitive_type) void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 primitive_type)
{ {
GetPixelShaderUid(uid->puid, dstAlphaMode, API_OPENGL); uid->puid = GetPixelShaderUid(dstAlphaMode, API_OPENGL);
GetVertexShaderUid(uid->vuid, API_OPENGL); uid->vuid = GetVertexShaderUid(API_OPENGL);
GetGeometryShaderUid(uid->guid, primitive_type, API_OPENGL); uid->guid = GetGeometryShaderUid(primitive_type, API_OPENGL);
if (g_ActiveConfig.bEnableShaderDebugging) if (g_ActiveConfig.bEnableShaderDebugging)
{ {
ShaderCode pcode; ShaderCode pcode = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL);
GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL);
pixel_uid_checker.AddToIndexAndCheck(pcode, uid->puid, "Pixel", "p"); pixel_uid_checker.AddToIndexAndCheck(pcode, uid->puid, "Pixel", "p");
ShaderCode vcode; ShaderCode vcode = GenerateVertexShaderCode(API_OPENGL);
GenerateVertexShaderCode(vcode, API_OPENGL);
vertex_uid_checker.AddToIndexAndCheck(vcode, uid->vuid, "Vertex", "v"); vertex_uid_checker.AddToIndexAndCheck(vcode, uid->vuid, "Vertex", "v");
ShaderCode gcode; ShaderCode gcode = GenerateGeometryShaderCode(primitive_type, API_OPENGL);
GenerateGeometryShaderCode(gcode, primitive_type, API_OPENGL);
geometry_uid_checker.AddToIndexAndCheck(gcode, uid->guid, "Geometry", "g"); geometry_uid_checker.AddToIndexAndCheck(gcode, uid->guid, "Geometry", "g");
} }
} }

13
Source/Core/VideoCommon/GeometryShaderGen.cpp
View File

@ -30,8 +30,9 @@ template<class T> static inline void EmitVertex(T& out, const char* vertex, API_
template<class T> static inline void EndPrimitive(T& out, API_TYPE ApiType); template<class T> static inline void EndPrimitive(T& out, API_TYPE ApiType);
template<class T> template<class T>
static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE ApiType) static inline T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
{ {
T out;
// Non-uid template parameters will write to the dummy data (=> gets optimized out) // Non-uid template parameters will write to the dummy data (=> gets optimized out)
geometry_shader_uid_data dummy_data; geometry_shader_uid_data dummy_data;
geometry_shader_uid_data* uid_data = out.template GetUidData<geometry_shader_uid_data>(); geometry_shader_uid_data* uid_data = out.template GetUidData<geometry_shader_uid_data>();
@ -292,6 +293,8 @@ static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE A
if (text[sizeof(text) - 1] != 0x7C) if (text[sizeof(text) - 1] != 0x7C)
PanicAlert("GeometryShader generator - buffer too small, canary has been eaten!"); PanicAlert("GeometryShader generator - buffer too small, canary has been eaten!");
} }
return out;
} }
template<class T> template<class T>
@ -327,12 +330,12 @@ static inline void EndPrimitive(T& out, API_TYPE ApiType)
out.Write("\toutput.RestartStrip();\n"); out.Write("\toutput.RestartStrip();\n");
} }
void GetGeometryShaderUid(GeometryShaderUid& object, u32 primitive_type, API_TYPE ApiType) GeometryShaderUid GetGeometryShaderUid(u32 primitive_type, API_TYPE ApiType)
{ {
GenerateGeometryShader<GeometryShaderUid>(object, primitive_type, ApiType); return GenerateGeometryShader<GeometryShaderUid>(primitive_type, ApiType);
} }
void GenerateGeometryShaderCode(ShaderCode& object, u32 primitive_type, API_TYPE ApiType) ShaderCode GenerateGeometryShaderCode(u32 primitive_type, API_TYPE ApiType)
{ {
GenerateGeometryShader<ShaderCode>(object, primitive_type, ApiType); return GenerateGeometryShader<ShaderCode>(primitive_type, ApiType);
} }

4
Source/Core/VideoCommon/GeometryShaderGen.h
View File

@ -26,5 +26,5 @@ struct geometry_shader_uid_data
typedef ShaderUid<geometry_shader_uid_data> GeometryShaderUid; typedef ShaderUid<geometry_shader_uid_data> GeometryShaderUid;
void GenerateGeometryShaderCode(ShaderCode& object, u32 primitive_type, API_TYPE ApiType); ShaderCode GenerateGeometryShaderCode(u32 primitive_type, API_TYPE ApiType);
void GetGeometryShaderUid(GeometryShaderUid& object, u32 primitive_type, API_TYPE ApiType); GeometryShaderUid GetGeometryShaderUid(u32 primitive_type, API_TYPE ApiType);

18
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -166,8 +166,9 @@ template<class T> static inline void WriteAlphaTest(T& out, pixel_shader_uid_dat
template<class T> static inline void WriteFog(T& out, pixel_shader_uid_data* uid_data); template<class T> static inline void WriteFog(T& out, pixel_shader_uid_data* uid_data);
template<class T> template<class T>
static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType) static inline T GeneratePixelShader(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType)
{ {
T out;
const u32 components = VertexLoaderManager::g_current_components; const u32 components = VertexLoaderManager::g_current_components;
// Non-uid template parameters will write to the dummy data (=> gets optimized out) // Non-uid template parameters will write to the dummy data (=> gets optimized out)
pixel_shader_uid_data dummy_data; pixel_shader_uid_data dummy_data;
@ -667,6 +668,8 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T
if (text[sizeof(text) - 1] != 0x7C) if (text[sizeof(text) - 1] != 0x7C)
PanicAlert("PixelShader generator - buffer too small, canary has been eaten!"); PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
} }
return out;
} }
@ -1170,17 +1173,12 @@ static inline void WriteFog(T& out, pixel_shader_uid_data* uid_data)
out.Write("\tprev.rgb = (prev.rgb * (256 - ifog) + " I_FOGCOLOR".rgb * ifog) >> 8;\n"); out.Write("\tprev.rgb = (prev.rgb * (256 - ifog) + " I_FOGCOLOR".rgb * ifog) >> 8;\n");
} }
void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType) PixelShaderUid GetPixelShaderUid(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType)
{ {
GeneratePixelShader<PixelShaderUid>(object, dstAlphaMode, ApiType); return GeneratePixelShader<PixelShaderUid>(dstAlphaMode, ApiType);
} }
void GeneratePixelShaderCode(ShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType) ShaderCode GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType)
{ {
GeneratePixelShader<ShaderCode>(object, dstAlphaMode, ApiType); return GeneratePixelShader<ShaderCode>(dstAlphaMode, ApiType);
}
void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType)
{
GeneratePixelShader<PixelShaderConstantProfile>(object, dstAlphaMode, ApiType);
} }

6
Source/Core/VideoCommon/PixelShaderGen.h
View File

@ -114,8 +114,6 @@ struct pixel_shader_uid_data
#pragma pack() #pragma pack()
typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid; typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
typedef ShaderConstantProfile PixelShaderConstantProfile; // TODO: Obsolete
void GeneratePixelShaderCode(ShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType); ShaderCode GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType);
void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType); PixelShaderUid GetPixelShaderUid(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType);
void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType);

13
Source/Core/VideoCommon/VertexShaderGen.cpp
View File

@ -16,8 +16,9 @@
static char text[16768]; static char text[16768];
template<class T> template<class T>
static inline void GenerateVertexShader(T& out, API_TYPE api_type) static inline T GenerateVertexShader(API_TYPE api_type)
{ {
T out;
const u32 components = VertexLoaderManager::g_current_components; const u32 components = VertexLoaderManager::g_current_components;
// Non-uid template parameters will write to the dummy data (=> gets optimized out) // Non-uid template parameters will write to the dummy data (=> gets optimized out)
vertex_shader_uid_data dummy_data; vertex_shader_uid_data dummy_data;
@ -394,14 +395,16 @@ static inline void GenerateVertexShader(T& out, API_TYPE api_type)
if (text[sizeof(text) - 1] != 0x7C) if (text[sizeof(text) - 1] != 0x7C)
PanicAlert("VertexShader generator - buffer too small, canary has been eaten!"); PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
} }
return out;
} }
void GetVertexShaderUid(VertexShaderUid& object, API_TYPE api_type) VertexShaderUid GetVertexShaderUid(API_TYPE api_type)
{ {
GenerateVertexShader<VertexShaderUid>(object, api_type); return GenerateVertexShader<VertexShaderUid>(api_type);
} }
void GenerateVertexShaderCode(ShaderCode& object, API_TYPE api_type) ShaderCode GenerateVertexShaderCode(API_TYPE api_type)
{ {
GenerateVertexShader<ShaderCode>(object, api_type); return GenerateVertexShader<ShaderCode>(api_type);
} }

4
Source/Core/VideoCommon/VertexShaderGen.h
View File

@ -60,5 +60,5 @@ struct vertex_shader_uid_data
typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid; typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
void GetVertexShaderUid(VertexShaderUid& object, API_TYPE api_type); VertexShaderUid GetVertexShaderUid(API_TYPE api_type);
void GenerateVertexShaderCode(ShaderCode& object, API_TYPE api_type); ShaderCode GenerateVertexShaderCode(API_TYPE api_type);