diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-01-28 15:32:38 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-01-28 15:32:38 -0600 |
| commit | fa454035571544fe58936c0c821ed8ccb5e6b72d (patch) | |
| tree | 5b7cfd1ce5fa6fcbc3ea81ea2f61bdc46da9ac44 /Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | |
| parent | d94f3c4155d8248bb08cbbf7fcd96d8d3d44516d (diff) | |
Got to love that my server's cmake is half retarded.
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index e1763038ec..76bf1e7e81 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -32,16 +32,23 @@ float *ProgramShaderCache::s_ubo_buffer; u32 ProgramShaderCache::s_ubo_buffer_size; bool ProgramShaderCache::s_ubo_dirty; -LinearDiskCache<ProgramShaderCache::ShaderUID, u8> g_program_disk_cache; +LinearDiskCache<u64, u8> g_program_disk_cache; GLenum ProgramFormat; GLuint ProgramShaderCache::PCacheEntry::prog_format = 0; u64 ProgramShaderCache::CurrentShaderProgram; + u64 Create_Pair(u32 key1, u32 key2) { return (((u64)key1) << 32) | key2; } +void Get_Pair(u64 key, u32 *key1, u32 *key2) +{ + *key1 = (key & 0xFFFFFFFF00000000) >> 32; + *key2 = key & 0xFFFFFFFF; +} + const char *UniformNames[NUM_UNIFORMS] = { // PIXEL SHADER UNIFORMS |