diff options
| author | Yonit Halperin <yhalperi@redhat.com> | 2011-09-18 14:52:04 +0300 |
|---|---|---|
| committer | Yonit Halperin <yhalperi@redhat.com> | 2011-11-02 11:30:21 +0200 |
| commit | f22caf9aee2aa64313468b04efa615e2e1c7f8b3 (patch) | |
| tree | f34d73c8f99b8eef51c43378617411fd5def8353 /client/red_gl_canvas.cpp | |
| parent | 76966571748efa32a706d21830349ab2431aa4e6 (diff) | |
| download | spice-f22caf9aee2aa64313468b04efa615e2e1c7f8b3.tar.gz spice-f22caf9aee2aa64313468b04efa615e2e1c7f8b3.tar.xz spice-f22caf9aee2aa64313468b04efa615e2e1c7f8b3.zip | |
client: rewrite surfaces cache
use std::map instead of a specific template (CHash).
There is no need for special template. Moreover, using
std::map will allow easy iteration over the surfaces.
(cherry picked from commit fcb3b4ce5231218bcf949da4270bd85a2cfb3535 branch 0.8)
Conflicts:
client/display_channel.cpp
Diffstat (limited to 'client/red_gl_canvas.cpp')
| -rw-r--r-- | client/red_gl_canvas.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/red_gl_canvas.cpp b/client/red_gl_canvas.cpp index 92529ce5..abe08558 100644 --- a/client/red_gl_canvas.cpp +++ b/client/red_gl_canvas.cpp @@ -36,7 +36,7 @@ GCanvas::GCanvas(int width, int height, uint32_t format, RedWindow *win, RenderType rendertype, PixmapCache& pixmap_cache, PaletteCache& palette_cache, - GlzDecoderWindow &glz_decoder_window, CSurfaces &csurfaces) + GlzDecoderWindow &glz_decoder_window, SurfacesCache &csurfaces) : Canvas(pixmap_cache, palette_cache, glz_decoder_window, csurfaces) , _pixmap (0) , _textures_lost (false) @@ -48,7 +48,7 @@ GCanvas::GCanvas(int width, int height, uint32_t format, RedWindow *win, SPICE_SURFACE_FMT_DEPTH(format), &pixmap_cache.base, &palette_cache.base, - &csurfaces.base, + &csurfaces, &glz_decoder(), &jpeg_decoder(), &zlib_decoder()))) { |