diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2015-10-29 14:43:05 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2015-10-29 14:43:05 +0100 |
| commit | 70666891312fb70862dc1a500795da958bcbba7d (patch) | |
| tree | 1c0f7ec638e4758a8150a6db3fd38a11b852548a /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | |
| parent | c1c311d13216361a2d50e3bdc77f5752e60e7483 (diff) | |
ShaderCaches: remove unneeded typedefs
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 17a2821f20..aa91a92478 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -36,9 +36,9 @@ static GLuint CurrentProgram = 0; ProgramShaderCache::PCache ProgramShaderCache::pshaders; ProgramShaderCache::PCacheEntry* ProgramShaderCache::last_entry; SHADERUID ProgramShaderCache::last_uid; -UidChecker<PixelShaderUid,PixelShaderCode> ProgramShaderCache::pixel_uid_checker; -UidChecker<VertexShaderUid,VertexShaderCode> ProgramShaderCache::vertex_uid_checker; -UidChecker<GeometryShaderUid,ShaderCode> ProgramShaderCache::geometry_uid_checker; +UidChecker<PixelShaderUid, ShaderCode> ProgramShaderCache::pixel_uid_checker; +UidChecker<VertexShaderUid, ShaderCode> ProgramShaderCache::vertex_uid_checker; +UidChecker<GeometryShaderUid, ShaderCode> ProgramShaderCache::geometry_uid_checker; static char s_glsl_header[1024] = ""; @@ -211,8 +211,8 @@ SHADER* ProgramShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components last_entry = &newentry; newentry.in_cache = 0; - VertexShaderCode vcode; - PixelShaderCode pcode; + ShaderCode vcode; + ShaderCode pcode; ShaderCode gcode; GenerateVertexShaderCode(vcode, components, API_OPENGL); GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components); @@ -404,11 +404,11 @@ void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, if (g_ActiveConfig.bEnableShaderDebugging) { - PixelShaderCode pcode; + ShaderCode pcode; GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components); pixel_uid_checker.AddToIndexAndCheck(pcode, uid->puid, "Pixel", "p"); - VertexShaderCode vcode; + ShaderCode vcode; GenerateVertexShaderCode(vcode, components, API_OPENGL); vertex_uid_checker.AddToIndexAndCheck(vcode, uid->vuid, "Vertex", "v"); |
