From d0b9aff2f024080527c8b7b154ed47fe8bc39908 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Thu, 26 Nov 2015 00:00:41 +0100 Subject: [PATCH] ColorMapManager: Fix OpenGL implementation. --- src/Layers/xrRender/ColorMapManager.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Layers/xrRender/ColorMapManager.cpp b/src/Layers/xrRender/ColorMapManager.cpp index 39285b99767..7d08b18ba6c 100644 --- a/src/Layers/xrRender/ColorMapManager.cpp +++ b/src/Layers/xrRender/ColorMapManager.cpp @@ -25,9 +25,14 @@ void ColorMapManager::UpdateTexture(const shared_str &strTexName, int iTex) map_TexIt I = m_TexCache.find(strTexName); if (I!=m_TexCache.end()) { +#ifdef USE_OGL + GLuint e0 = I->second->surface_get(); + m_CMap[iTex]->surface_set(GL_TEXTURE_2D, e0); +#else ID3DBaseTexture* e0 = I->second->surface_get(); m_CMap[iTex]->surface_set(e0); _RELEASE(e0); +#endif // USE_OGL } else { @@ -36,14 +41,23 @@ void ColorMapManager::UpdateTexture(const shared_str &strTexName, int iTex) m_TexCache.insert (mk_pair(strTexName,tmp)); +#ifdef USE_OGL + GLuint e0 = tmp->surface_get(); + m_CMap[iTex]->surface_set(GL_TEXTURE_2D, e0); +#else ID3DBaseTexture* e0 = tmp->surface_get(); m_CMap[iTex]->surface_set(e0); _RELEASE(e0); +#endif // USE_OGL } } else { +#ifdef USE_OGL + m_CMap[iTex]->surface_set(GL_TEXTURE_2D, 0); +#else m_CMap[iTex]->surface_set(0); +#endif // USE_OGL }