From 46b5cc220ac19814f8cc233102b1e779bc9fc1f7 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Sat, 26 Jan 2008 22:51:51 +0000 Subject: [PATCH] Corrected GLRenderer's instantiation function name. (I guess frenchies are guilty here, as mmu_man's ThemeAddOn have the same disease...) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23757 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/opengl/GLRenderer.h | 2 +- .../mesa_software_renderer/MesaSoftwareRenderer.cpp | 4 +--- src/kits/opengl/GLRendererRoster.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/headers/os/opengl/GLRenderer.h b/headers/os/opengl/GLRenderer.h index 245c8965ee..4f2359dfa9 100644 --- a/headers/os/opengl/GLRenderer.h +++ b/headers/os/opengl/GLRenderer.h @@ -63,7 +63,7 @@ private: renderer_id fID; }; -extern "C" _EXPORT BGLRenderer * instanciate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher); +extern "C" _EXPORT BGLRenderer * instantiate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher); #endif // GLRENDERER_H diff --git a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp index 1ccb2a1903..86b5719b89 100644 --- a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp +++ b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp @@ -132,10 +132,8 @@ extern const char * color_space_name(color_space space); #include "swrast/s_spantemp.h" -// TODO: Rename this to "instantiate_gl_renderer" to -// be consistent with BArchivable api ? extern "C" _EXPORT BGLRenderer * - instanciate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher) + instantiate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher) { return new MesaSoftwareRenderer(view, options, dispatcher); } diff --git a/src/kits/opengl/GLRendererRoster.cpp b/src/kits/opengl/GLRendererRoster.cpp index f06086945c..03872d00f4 100644 --- a/src/kits/opengl/GLRendererRoster.cpp +++ b/src/kits/opengl/GLRendererRoster.cpp @@ -132,12 +132,12 @@ GLRendererRoster::CreateRenderer(const entry_ref& ref) if (image < B_OK) return image; - BGLRenderer *(*instanc)(BGLView *view, ulong options, BGLDispatcher *dispatcher); + BGLRenderer *(*instantiate_renderer)(BGLView *view, ulong options, BGLDispatcher *dispatcher); - status = get_image_symbol(image, "instanciate_gl_renderer", - B_SYMBOL_TYPE_TEXT, (void**)&instanc); + status = get_image_symbol(image, "instantiate_gl_renderer", + B_SYMBOL_TYPE_TEXT, (void**)&instantiate_renderer); if (status == B_OK) { - BGLRenderer *renderer = instanc(fView, fOptions, new BGLDispatcher()); + BGLRenderer *renderer = instantiate_renderer(fView, fOptions, new BGLDispatcher()); if (!renderer) { unload_add_on(image); return B_UNSUPPORTED;